commit 36eb6e1154774cef085693148a5402b2e01c1808
author Charles M.C. Chan <rascov@gmail.com> Tue Jan 06 17:12:27 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Jan 06 17:38:13 2015 +0000
tree 0745203619d0e01c1f637fd6a5a6793c86ca65a6
parent 237787cbaa88fe08981bbeab752f6dee85ee8fec

Bugfix: Criteria.toString() does not convert unsigned variables properly.

For example, in the response of 'flows' command, the ethType of IPv6 (0x86dd) is shown as ff..ff86dd instead of 86dd
Note: VlanId/VlanPcp still remains in signed format in this commit since:
  * VLAN tag is actually 12 bits. There should be no problem even if it is printed as signed short.
  * VLAN PCP is actually 3 bits. There should be no problem even if it is printed as signed short.
  * -1 is used in many places to indicate untagged vlan

Change-Id: Ib68161d552a0011e6a6666970907cf9ca846f620

core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
index a41b238..dcc7edc 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
@@ -298,7 +298,8 @@
         @Override
         public String toString() {
             return toStringHelper(type().toString())
-                    .add("ethType", Long.toHexString(ethType)).toString();
+                    .add("ethType", Long.toHexString(ethType & 0xffff))
+                    .toString();
         }
 
         @Override
@@ -396,7 +397,8 @@
         @Override
         public String toString() {
             return toStringHelper(type().toString())
-                    .add("protocol", Long.toHexString(proto)).toString();
+                    .add("protocol", Long.toHexString(proto & 0xff))
+                    .toString();
         }
 
         @Override
@@ -542,7 +544,7 @@
         @Override
         public String toString() {
             return toStringHelper(type().toString())
-                    .add("tcpPort", tcpPort).toString();
+                    .add("tcpPort", tcpPort & 0xffff).toString();
         }
 
         @Override
@@ -589,7 +591,7 @@
         @Override
         public String toString() {
             return toStringHelper(type().toString())
-                    .add("mpls", mplsLabel.intValue()).toString();
+                    .add("mpls", mplsLabel & 0xffffffffL).toString();
         }
 
         @Override
@@ -639,7 +641,7 @@
         @Override
         public String toString() {
             return toStringHelper(type().toString())
-                    .add("lambda", lambda).toString();
+                    .add("lambda", lambda & 0xffff).toString();
         }
 
         @Override
@@ -686,7 +688,7 @@
         @Override
         public String toString() {
             return toStringHelper(type().toString())
-                    .add("signalType", signalType).toString();
+                    .add("signalType", signalType & 0xffff).toString();
         }
 
         @Override