From 3c35fd7a24f7dd99dd43a168b2b5bb83dc9fda14 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 4 Mar 2016 14:31:08 +0100 Subject: [PATCH] Fix a guaranteed NPE If we fail to decode a packet, we will end up causing a NPE in statistics. Use the packetIn class for that instead. Change-Id: Ib53ca939ee4a08319c2595d560bfdd99c013eba2 Signed-off-by: Robert Varga --- .../openflowplugin/impl/device/DeviceContextImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java index f5ad89c479..524e223f45 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.md.sal.binding.api.NotificationService; @@ -465,7 +464,7 @@ public class DeviceContextImpl implements DeviceContext, ExtensionConverterProvi if (packetReceived == null) { LOG.debug("Received a null packet from switch {}", connectionAdapter.getRemoteAddress()); - messageSpy.spyMessage(packetReceived.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_TRANSLATE_SRC_FAILURE); + messageSpy.spyMessage(packetInMessage.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_TRANSLATE_SRC_FAILURE); return; } else { messageSpy.spyMessage(packetReceived.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_TRANSLATE_OUT_SUCCESS); -- 2.36.6