Made OFMatch.fromString() take hex for VLAN

added Unittest
code submitted from  roberto.doriguzzi@create-net.org
    Thanks!

src/main/java/org/openflow/protocol/OFMatch.java

@@ -865,7 +865,11 @@ public class OFMatch implements Cloneable, Serializable {
                     this.dataLayerType = U16.t(Integer.valueOf(values[1]));
                 this.wildcards &= ~OFPFW_DL_TYPE;
             } else if (values[0].equals(STR_DL_VLAN)) {
-                this.dataLayerVirtualLan = U16.t(Integer.valueOf(values[1]));
+            	if (values[1].startsWith("0x"))
+            		this.dataLayerVirtualLan = U16.t(Integer.valueOf(
+            				values[1].replaceFirst("0x", ""),16));
+            	else
+            		this.dataLayerVirtualLan = U16.t(Integer.valueOf(values[1]));
                 this.wildcards &= ~OFPFW_DL_VLAN;
             } else if (values[0].equals(STR_DL_VLAN_PCP)) {
                 this.dataLayerVirtualLanPriorityCodePoint = U8.t(Short

src/test/java/org/openflow/protocol/OFMatchTest.java

@@ -48,7 +48,15 @@ public class OFMatchTest extends TestCase {
         TestCase.assertEquals(correct.getNetworkSourceMaskLen(), tester
                 .getNetworkSourceMaskLen());
         TestCase.assertEquals(correct, tester);
-    }
+        
+        // 0xVlan
+        correct = new OFMatch();
+        correct.setDataLayerVirtualLan((short)65535);
+        correct.setWildcards(~OFMatch.OFPFW_DL_VLAN);
+        tester = new OFMatch();
+        tester.fromString("dl_vlan=0xffff");
+        TestCase.assertEquals(correct, tester);
+        }
 
     public void testToString() {
         OFMatch match = new OFMatch();