commit 229554a0a493d27520a8182971792e7bdb1e270d
author Vidyashree Rama <vidyashree.rama@huawei.com> Fri Apr 14 15:24:45 2017 +0530
committer Andrea Campanella <andrea@onlab.us> Fri Apr 14 12:04:23 2017 +0000
tree 169dcc68cc39a6f8b0a53c22a18fa1a6c746b20d
parent cf117ce6f2ee0ba0124edf7c7bca23ce4f19bc53

[ONOS-6305]Null pointer exception when query for netconf session in multi-instance scenario.

Change-Id: I952a0a10caffe81cb0f11381635be940304ecf8f

providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java

diff --git a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
index 0101790..55d6f0c 100644
--- a/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
+++ b/providers/netconf/device/src/main/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProvider.java
@@ -417,7 +417,8 @@
                 }
             } else if (!isReachable && deviceService.isAvailable(deviceId)) {
                 providerService.deviceDisconnected(deviceId);
-            } else if (isReachable && deviceService.isAvailable(deviceId)) {
+            } else if (isReachable && deviceService.isAvailable(deviceId) &&
+                    mastershipService.isLocalMaster(deviceId)) {
                 updatePortStatistics(device);
             }
         }