X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowjava%2Fopenflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fserialization%2Ffactories%2FOF10FlowRemovedMessageFactory.java;h=f55d4cfb0e537d6c49704f9dca801f05243a35bd;hb=13e1d5e6c0237b9378d60526dd8c1d79db6d2b49;hp=81519758973a69b9b0237fa476349e03fa6026d0;hpb=3e97660003f4a55d5bd156f5cb6cf2d955e3ff9e;p=openflowplugin.git

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactory.java
index 8151975897..f55d4cfb0e 100644
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowRemovedMessageFactory.java
@@ -7,7 +7,9 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.serialization.factories;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.buffer.ByteBuf;
+import java.util.Objects;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistryInjector;
@@ -34,21 +36,24 @@ public class OF10FlowRemovedMessageFactory implements OFSerializer<FlowRemovedMe
     }
 
     @Override
+    @SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR") // FB doesn't recognize Objects.requireNonNull
     public void serialize(FlowRemovedMessage message, ByteBuf outBuffer) {
+        Objects.requireNonNull(registry);
+
         ByteBufUtils.writeOFHeader(MESSAGE_TYPE, message, outBuffer, EncodeConstants.EMPTY_LENGTH);
 
         OFSerializer<MatchV10> matchSerializer = registry
-                .getSerializer(new MessageTypeKey<>(message.getVersion(), MatchV10.class));
+                .getSerializer(new MessageTypeKey<>(message.getVersion().toJava(), MatchV10.class));
 
         matchSerializer.serialize(message.getMatchV10(), outBuffer);
 
         outBuffer.writeLong(message.getCookie().longValue());
-        outBuffer.writeShort(message.getPriority());
+        outBuffer.writeShort(message.getPriority().toJava());
         outBuffer.writeByte(message.getReason().getIntValue());
         outBuffer.writeZero(PADDING);
         outBuffer.writeInt(message.getDurationSec().intValue());
         outBuffer.writeInt(message.getDurationNsec().intValue());
-        outBuffer.writeShort(message.getIdleTimeout());
+        outBuffer.writeShort(message.getIdleTimeout().toJava());
         outBuffer.writeZero(PADDING);
         outBuffer.writeZero(PADDING);
         outBuffer.writeLong(message.getPacketCount().longValue());