From 148ba2f86c350d8474ff9da9ecd6c00d08e84a17 Mon Sep 17 00:00:00 2001 From: Brian O'Connor Date: Mon, 6 Jul 2015 11:38:44 -0700 Subject: [PATCH] Improving null safety of GossipIntentStore peer update function Change-Id: I4f517d899c98f7c6cd0964465dfbcebae17363a3 --- .../onosproject/store/intent/impl/GossipIntentStore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java index a884e7aca5..310d3660fb 100644 --- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java +++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java @@ -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()); - return ImmutableList.of(master); + log.warn("Not master or origin for intent {}", key); + return master != null ? ImmutableList.of(master) : getRandomNode(); } }