Fix NPE when setting strict if there are no links present

Change-Id: Ic43d8807d5d2a86a3f716214c7fcf5a00f1e9477

Fix NPE when setting strict if there are no links present
Change-Id: Ic43d8807d5d2a86a3f716214c7fcf5a00f1e9477
Ray Milkey · Gerrit Code Review
Commit 15551272ca0b49ef4b116533678ac6de7f173b68 15551272 1 parent 17711e5a
Showing 1 changed file with 6 additions and 2 deletions
core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
View file @1555127
+++ b/core/store/dist/src/main/java/org/onosproject/store/link/impl/ECLinkStore.java
View file @1555127
@@ -493,8 +493,12 @@ public class ECLinkStore
             if (linkDiscoveryMode == LinkDiscoveryMode.STRICT) {
                 // Remove any previous links to force them to go through the strict
                 // discovery process
-                linkDescriptions.clear();
+                if (linkDescriptions != null) {
-                links.clear();
+                    linkDescriptions.clear();
+                }
+                if (links != null) {
+                    links.clear();
+                }
             }
             log.debug("config set link discovery mode to {}",
                       linkDiscoveryMode.name());