commit ada9e2d9debced2dd255907ea4cada4de3c330b0
author Ray Milkey <ray@onlab.us> Tue Apr 05 16:42:35 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Apr 06 00:01:24 2016 +0000
tree 62f729cfc256f0c5d9997a2e507825aec457e59d
parent 541413dc8d0e7c69f0349efd83be7b5ba105ddf6

Don't crash if a message is processed after the provider service goes down

Change-Id: I098cebaffdd8d80bca640fe29b746c91b75689ac

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
index 16fca36..40f82e7 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
@@ -434,6 +434,10 @@
 
         @Override
         public void handleMessage(Dpid dpid, OFMessage msg) {
+            if (providerService == null) {
+                // We are shutting down, nothing to be done
+                return;
+            }
             DeviceId deviceId = DeviceId.deviceId(Dpid.uri(dpid));
             switch (msg.getType()) {
                 case FLOW_REMOVED: