Optional fields - reverted

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

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactory.java
index 8889339a2e45d767fbd32f23a0870492b9a02993..511f1622a31d7e490de7916b88533c95d1923c57 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactory.java
@@ -49,18 +49,12 @@ public class FlowModInputMessageFactory implements OFSerializer<FlowModInput> {
         out.writeShort(message.getHardTimeout().intValue());\r
         out.writeShort(message.getPriority());\r
         out.writeInt(message.getBufferId().intValue());\r
-        if (message.getOutPort() != null) {\r
-            out.writeInt(message.getOutPort().getValue().intValue());\r
-        }\r
-        \r
-        if (message.getOutGroup() != null) {\r
-            out.writeInt(message.getOutGroup().intValue());\r
-        }\r
+        out.writeInt(message.getOutPort().getValue().intValue());\r
+        out.writeInt(message.getOutGroup().intValue());\r
         out.writeShort(createFlowModFlagsBitmask(message.getFlags()));\r
         ByteBufUtils.padBuffer(PADDING_IN_FLOW_MOD_MESSAGE, out);\r
         MatchSerializer.encodeMatch(message.getMatch(), out);\r
         InstructionsSerializer.encodeInstructions(message.getInstructions(), out);\r
-        \r
     }\r
 \r
     @Override\r