ONOS-2796: Fix removeLink NPE when links are removed concurrently from multiple nodes

Change-Id: I99d9bbe143ea4c8906f5ea4d5595a7f7bcddad49

@@ -336,8 +336,13 @@ public class ECLinkStore
     @Override
     @Override
     public LinkEvent removeLink(ConnectPoint src, ConnectPoint dst) {
     public LinkEvent removeLink(ConnectPoint src, ConnectPoint dst) {
         final LinkKey linkKey = LinkKey.linkKey(src, dst);
         final LinkKey linkKey = LinkKey.linkKey(src, dst);
+        ProviderId primaryProviderId = getBaseProviderId(linkKey);
+        // Stop if there is no base provider.
+        if (primaryProviderId == null) {
+            return null;
+        }
         LinkDescription removedLinkDescription =
         LinkDescription removedLinkDescription =
-                linkDescriptions.remove(new Provided<>(linkKey, checkNotNull(getBaseProviderId(linkKey))));
+                linkDescriptions.remove(new Provided<>(linkKey, primaryProviderId));
         if (removedLinkDescription != null) {
         if (removedLinkDescription != null) {
             return purgeLinkCache(linkKey);
             return purgeLinkCache(linkKey);
         }
         }