| commit | 4c5e02100dbc44bc5a5aabcc70664b75fb4e4693 | [log] [tgz] |
|---|---|---|
| author | abat <abat@bigswitch.com> | Thu Nov 07 18:04:37 2013 -0800 |
| committer | abat <abat@bigswitch.com> | Thu Nov 07 18:04:37 2013 -0800 |
| tree | ce4ed470b0e6c3ca6d572a0be447977b18d7311c | |
| parent | 40c3a85523b7cb811dee227d936d687541f56054 [diff] | |
| parent | 503ceaceb002bd7cc526e0261a2a5fe94323967c [diff] |
Merge into master from pull request #115: java_gen: small convenience fix to VlanVid (use int) (https://github.com/floodlight/loxigen/pull/115)
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/VlanVid.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/VlanVid.java index b63e4dc..8337eb6 100644 --- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/VlanVid.java +++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/VlanVid.java
@@ -30,10 +30,10 @@ this.vid = vid; } - public static VlanVid ofVlan(short vid) { + public static VlanVid ofVlan(int vid) { if ((vid & VALIDATION_MASK) != vid) throw new IllegalArgumentException(String.format("Illegal VLAN value: %x", vid)); - return new VlanVid(vid); + return new VlanVid((short) vid); } /** @return the actual VLAN tag this vid identifies */