commit 6704df37670809b6929a65cdd25a3a6cc36783ff
author Kavitha Alagesan <kalagesa@partner.ciena.com> Thu Aug 18 15:15:31 2016 +0530
committer Kavitha Alagesan <kalagesa@partner.ciena.com> Tue Aug 23 05:07:50 2016 +0000
tree 08f1ae291ebaa6006b14823723458848660ffccc
parent d3ff540f3674d4d2fa064c1b30925dbb205bb7ac

Fix for ONOS-4877

Change-Id: Ibdb6dfea672c0900fd3d8dea0441c55c23940f81
(cherry picked from commit 6683c2fcdc6659f2bd481a4536cb6f36fbe3a152)

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 5a5b101..9415e3a 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
@@ -222,7 +222,9 @@
     }
 
     private void createCollector(OpenFlowSwitch sw) {
-        checkNotNull(sw, "Null switch");
+        if (sw == null) {
+            return;
+        }
         if (adaptiveFlowSampling) {
             // NewAdaptiveFlowStatsCollector Constructor
             NewAdaptiveFlowStatsCollector fsc =