홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
148ba2f8 1 parent c6154859

Improving null safety of GossipIntentStore peer update function 

Change-Id: I4f517d899c98f7c6cd0964465dfbcebae17363a3
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
......@@ -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();
}
}
......