commit 27bee090070992b0d7f02a24147b781fa6f16f93
author Thomas Vachuska <tom@onlab.us> Tue Jun 23 19:03:10 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Tue Jun 23 19:03:10 2015 -0700
tree 86194927003459110649758981da1b9ae575badf
parent c97aa6110e76737169fc409ebdf763576ed6bd94

ONOS-2145  Added ability to withdraw packet intercepts via PacketService::cancelPackets.

Change-Id: Ie41271fa02740560bd67b0faf49f633ee749773c

core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index d5b12b3..b92067f 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -498,10 +498,10 @@
                 FlowRuleBatchOperation batchOperation =
                         request.asBatchOperation(deviceId);
 
-                FlowRuleProvider flowRuleProvider =
-                        getProvider(deviceId);
-
-                flowRuleProvider.executeBatch(batchOperation);
+                FlowRuleProvider flowRuleProvider = getProvider(deviceId);
+                if (flowRuleProvider != null) {
+                    flowRuleProvider.executeBatch(batchOperation);
+                }
 
                 break;