commit a14eb171b4c2cce22317be2c711d11d02cc0c228
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Mar 24 15:03:23 2014 -0700
committer Gerrit Code Review <gerrit2@onos-services> Wed Mar 26 14:07:37 2014 -0700
tree 53b8814ce305ab7bdd31a99e8a7fd66871e6f3a6
parent 826b4a4847bc5f9c394516a0f1c30502dd92c927

Cosmetics fixes against datastore package

- no functional changes

Change-Id: I220c2df854e748c5a5a888b27d6d79f38523e322

src/main/java/net/onrc/onos/datastore/topology/KVLink.java

diff --git a/src/main/java/net/onrc/onos/datastore/topology/KVLink.java b/src/main/java/net/onrc/onos/datastore/topology/KVLink.java
index 5fbf070..9d39787 100644
--- a/src/main/java/net/onrc/onos/datastore/topology/KVLink.java
+++ b/src/main/java/net/onrc/onos/datastore/topology/KVLink.java
@@ -86,18 +86,18 @@
     }
 
     public static long[] getLinkTupleFromKey(final ByteBuffer keyBuf) {
-        long[] tuple = new long[4];
         if (keyBuf.getChar() != 'L') {
             throw new IllegalArgumentException("Invalid Link key");
         }
-        long[] src_port_pair = KVPort.getPortPairFromKey(keyBuf.slice());
+        final long[] srcPortPair = KVPort.getPortPairFromKey(keyBuf.slice());
         keyBuf.position(2 + PortEvent.PORTID_BYTES);
-        long[] dst_port_pair = KVPort.getPortPairFromKey(keyBuf.slice());
+        final long[] dstPortPair = KVPort.getPortPairFromKey(keyBuf.slice());
 
-        tuple[0] = src_port_pair[0];
-        tuple[1] = src_port_pair[1];
-        tuple[2] = dst_port_pair[0];
-        tuple[3] = dst_port_pair[1];
+        long[] tuple = new long[4];
+        tuple[0] = srcPortPair[0];
+        tuple[1] = srcPortPair[1];
+        tuple[2] = dstPortPair[0];
+        tuple[3] = dstPortPair[1];
 
         return tuple;
     }

src/main/java/net/onrc/onos/datastore/topology/KVPort.java

diff --git a/src/main/java/net/onrc/onos/datastore/topology/KVPort.java b/src/main/java/net/onrc/onos/datastore/topology/KVPort.java
index 452bf94..d31026a 100644
--- a/src/main/java/net/onrc/onos/datastore/topology/KVPort.java
+++ b/src/main/java/net/onrc/onos/datastore/topology/KVPort.java
@@ -65,12 +65,12 @@
     }
 
     public static long[] getPortPairFromKey(final ByteBuffer keyBuf) {
-        long[] pair = new long[2];
         if (keyBuf.getChar() != 'S') {
             throw new IllegalArgumentException("Invalid Port key:" + keyBuf
                     + " "
                     + ByteArrayUtil.toHexStringBuffer(keyBuf.array(), ":"));
         }
+        long[] pair = new long[2];
         pair[0] = keyBuf.getLong();
         if (keyBuf.getChar() != 'P') {
             throw new IllegalArgumentException("Invalid Port key:" + keyBuf