commit | e6a00f00bf858c4fc64b6aca61022c138839d86c | [log] [tgz] |
---|---|---|
author | David K. Bainbridge <dbainbri@ciena.com> | Wed Nov 07 11:43:43 2018 -0800 |
committer | Andrea Campanella <andrea@opennetworking.org> | Thu Nov 08 09:45:44 2018 +0100 |
tree | 0c11ac36128e8ebefd83738f3dd2b1001d2e8b9a | |
parent | a349da9d6ba1388b6a3d6f9623ee2dab59009b5a [diff] |
check if a value in a map exists before dereference, avoid NPE Change-Id: I9f5ef22e1fa5105cd9c1ee0d0a0b15c98f5a1abf
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 d9afbe3..e60e285 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
@@ -463,8 +463,9 @@ if (isReachable && deviceService.isAvailable(deviceId) && mastershipService.isLocalMaster(deviceId)) { //if ports are not discovered, retry the discovery + AtomicInteger count = retriedPortDiscoveryMap.get(deviceId); if (deviceService.getPorts(deviceId).isEmpty() && - retriedPortDiscoveryMap.get(deviceId).getAndIncrement() < maxRetries) { + count != null && count.getAndIncrement() < maxRetries) { discoverPorts(deviceId); } updatePortStatistics(device);