commit 84382b9426734dcfeb4ada2be9a5c29ec89574c7
author Madan Jampani <madan@onlab.us> Wed Jun 22 08:26:49 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jun 23 08:48:38 2016 +0000
tree 0aa91da4c25cee8901515b0f304365e65d7a25b9
parent 71c32ca1584150c6b2774c91a970306f9818c2f5

Misc fixes in openflow provider subsystem

Change-Id: I5e6ab619f66ca71badc25efc7be7560070639051
(cherry picked from commit 91e1d737f6c60b48d7b2eb03a524138db1d68e8c)

providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java

diff --git a/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java b/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
index 952a47f..436b071 100644
--- a/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
+++ b/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
@@ -204,7 +204,7 @@
     }
 
     private void createStatsCollection(OpenFlowSwitch sw) {
-        if (isMeterSupported(sw)) {
+        if (sw != null && isMeterSupported(sw)) {
             MeterStatsCollector msc = new MeterStatsCollector(sw, POLL_INTERVAL);
             msc.start();
             stopCollectorIfNeeded(collectors.put(new Dpid(sw.getId()), msc));