Improving null safety of GossipIntentStore peer update function

Change-Id: I4f517d899c98f7c6cd0964465dfbcebae17363a3

Improving null safety of GossipIntentStore peer update function
Change-Id: I4f517d899c98f7c6cd0964465dfbcebae17363a3
Brian O'Connor · Gerrit Code Review
Commit 148ba2f86c350d8474ff9da9ecd6c00d08e84a17 148ba2f8 1 parent c6154859
Showing 1 changed file with 3 additions and 3 deletions
core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
View file @148ba2f
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
View file @148ba2f
@@ -195,7 +195,7 @@ public class GossipIntentStore
         NodeId origin = (data != null) ? data.origin() : null;
         if (master == null || origin == null) {
             log.warn("Intent {} has no home; master = {}, origin = {}",
-                     data.key(), master, origin);
+                     key, master, origin);
         }
         NodeId me = clusterService.getLocalNode().id();
@@ -208,8 +208,8 @@ public class GossipIntentStore
         } else if (isOrigin) {
             return master != null ? ImmutableList.of(master) : getRandomNode();
         } else {
-            log.warn("Not master or origin for intent {}", data.key());
+            log.warn("Not master or origin for intent {}", key);
-            return ImmutableList.of(master);
+            return master != null ? ImmutableList.of(master) : getRandomNode();
         }
     }