Fixed NPE when removing flows.

tom
Commit 7951b23a7cb97217bef7677b4379a6d8edd5c39f 7951b23a 1 parent a0ed763c
Showing 1 changed file with 4 additions and 2 deletions
core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
--- a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
View file @7951b23
+++ b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
View file @7951b23
@@ -103,9 +103,11 @@ public class FlowRuleManager
         for (int i = 0; i < flowRules.length; i++) {
             f = flowRules[i];
             device = deviceService.getDevice(f.deviceId());
-             frp = getProvider(device.providerId());
             store.deleteFlowRule(f);
-             frp.removeFlowRule(f);
+             if (device != null) {
+                 frp = getProvider(device.providerId());
+                 frp.removeFlowRule(f);
+             }
         }
     }