From e6a00f00bf858c4fc64b6aca61022c138839d86c Mon Sep 17 00:00:00 2001
From: "David K. Bainbridge" <dbainbri@ciena.com>
Date: Wed, 7 Nov 2018 11:43:43 -0800
Subject: [PATCH] check if a value in a map exists before dereference, avoid
 NPE

Change-Id: I9f5ef22e1fa5105cd9c1ee0d0a0b15c98f5a1abf
---
 .../provider/netconf/device/impl/NetconfDeviceProvider.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 d9afbe3407..e60e285b43 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 @@ public class NetconfDeviceProvider extends AbstractProvider
         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);