From: Ed Warnicke Date: Thu, 21 Nov 2013 11:45:27 +0000 (-0800) Subject: Fixed NPE in MD-FRM. X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~360^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0199f96873b6c42e85d91192e008c587aa4fd71c Fixed NPE in MD-FRM. There was an uninitialized ConcurrentMap. Initialized it. Change-Id: I1bc5c4959806c020b630b4a5da3e3a9c311850f5 Signed-off-by: Ed Warnicke --- diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/FlowConsumerImpl.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/FlowConsumerImpl.java index 82db78e7b9..9edb690a01 100644 --- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/FlowConsumerImpl.java +++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/forwardingrulesmanager/consumer/impl/FlowConsumerImpl.java @@ -71,7 +71,7 @@ public class FlowConsumerImpl implements IForwardingRulesManager { private IContainer container; private static final String NAMEREGEX = "^[a-zA-Z0-9]+$"; private static ConcurrentMap staticFlows; - private static ConcurrentMap staticFlowsOrdinal; + private static ConcurrentMap staticFlowsOrdinal = new ConcurrentHashMap(); /* * Inactive flow list. This is for the global instance of FRM It will * contain all the flow entries which were installed on the global container @@ -499,14 +499,14 @@ public class FlowConsumerImpl implements IForwardingRulesManager { @Override public void onNodeErrorNotification(NodeErrorNotification notification) { // TODO Auto-generated method stub - + } @Override public void onNodeExperimenterErrorNotification( NodeExperimenterErrorNotification notification) { // TODO Auto-generated method stub - + }; }