commit dde5a0b45196c3ddbffdc6e58e32502e2732b416
author Sho SHIMIZU <shimizu.sho@jp.fujitsu.com> Wed Jul 09 10:42:23 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Wed Jul 09 12:23:12 2014 -0700
tree 65151b5955f849b4bc4257253f545ea60738edd6
parent cd1ab1775fc516f563fbe4e211fc42439acfa889

Clean up SdnIp code

- Apply multiple exception catching
- Array creation is replaced with varargs

Change-Id: I9d7267c8cb4d35d84e974a4634f19350f265b9bf

src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java

diff --git a/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java b/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
index c8ab0bd..b8d8e87 100644
--- a/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
+++ b/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
@@ -231,10 +231,7 @@
 
             bgpdMacAddress = config.getBgpdMacAddress();
             vlan = config.getVlan();
-        } catch (JsonParseException e) {
-            log.error("Error in JSON file", e);
-            throw new ConfigurationRuntimeException("Error in JSON file", e);
-        } catch (JsonMappingException e) {
+        } catch (JsonParseException | JsonMappingException e) {
             log.error("Error in JSON file", e);
             throw new ConfigurationRuntimeException("Error in JSON file", e);
         } catch (IOException e) {
@@ -1115,9 +1112,9 @@
             Path path = pathsWaitingOnArp.remove(ipAddress);
 
             if (path != null) {
-                log.debug("Pushing path to {} at {} on {}", new Object[]{
+                log.debug("Pushing path to {} at {} on {}",
                         path.getDstIpAddress().getHostAddress(), macAddress,
-                        path.getDstInterface().getSwitchPort()});
+                        path.getDstInterface().getSwitchPort());
                 // These paths should always be to BGP peers. Paths to non-peers are
                 // handled once the first prefix is ready to push
                 if (pushedPaths.containsKey(path.getDstIpAddress())) {