Optional fields - reverted

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / GroupModInputMessageFactory.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
index 26ca0d46b688cb3c25eed29ab2a4c336bb0e4822..b60a7c29327e6b53389f0d6e8e0aa7d6da152caf 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
@@ -63,18 +63,9 @@ public class GroupModInputMessageFactory implements OFSerializer<GroupModInput>
         if (buckets != null) {\r
             for (BucketsList currentBucket : buckets) {\r
                 outBuffer.writeShort(computeLengthOfBucket(currentBucket));\r
-                \r
-                if (null != currentBucket.getWeight()) {\r
-                    outBuffer.writeShort(currentBucket.getWeight().shortValue());\r
-                }\r
-                \r
-                if (null != currentBucket.getWatchPort()) {\r
-                    outBuffer.writeInt(currentBucket.getWatchPort().getValue().intValue());\r
-                }\r
-                \r
-                if (null != currentBucket.getWatchGroup()) {\r
-                    outBuffer.writeInt(currentBucket.getWatchGroup().intValue());\r
-                }\r
+                outBuffer.writeShort(currentBucket.getWeight().shortValue());\r
+                outBuffer.writeInt(currentBucket.getWatchPort().getValue().intValue());\r
+                outBuffer.writeInt(currentBucket.getWatchGroup().intValue());\r
                 ByteBufUtils.padBuffer(PADDING_IN_BUCKET, outBuffer);\r
                 ActionsSerializer.encodeActions(currentBucket.getActionsList(), outBuffer);\r
             }\r