From f853f4cb2c1bd86ec2f227d34fad097073e5c1ee Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Wed, 20 Nov 2013 08:23:50 -0800 Subject: [PATCH] Fix NPE in FlowProgrammerService in openflow plugin - In default container have installed flows matching on input port. When creating the first container, default container flows are removed. On switch notification about flow removal, a NPE is hit in FlowProgrammerService because of the assumption the newly created container already has ports assigned. Change-Id: I645684f9bc47ea26d1fe9f45383343354fb3df6a Signed-off-by: Alessandro Boch --- .../openflow/internal/FlowProgrammerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java index b163c639a5..f26bcf718c 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowProgrammerService.java @@ -415,7 +415,7 @@ public class FlowProgrammerService implements IPluginInFlowProgrammerService, */ if (inPort == null || container.equals(GlobalConstants.DEFAULT.toString()) - || this.containerToNc.get(container).contains(inPort)) { + || (containerToNc.containsKey(container) && containerToNc.get(container).contains(inPort))) { notifier.flowRemoved(node, flow); } } -- 2.36.6