mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-28 14:51:37 +01:00
Code Issues Projects Releases Wiki Activity

Improving null safety of GossipIntentStore peer update function

Browse Source 
Change-Id: I4f517d899c98f7c6cd0964465dfbcebae17363a3
This commit is contained in:
Brian O'Connor 2015-07-06 11:38:44 -07:00 committed by Gerrit Code Review
parent c615485959
commit 148ba2f86c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java vendored
View File

@ -195,7 +195,7 @@ public class GossipIntentStore
NodeId origin = (data != null) ? data.origin() : null; NodeId origin = (data != null) ? data.origin() : null;
if (master == null || origin == null) { if (master == null || origin == null) {
log.warn("Intent {} has no home; master = {}, origin = {}", log.warn("Intent {} has no home; master = {}, origin = {}",
data.key(), master, origin); key, master, origin);
} }
NodeId me = clusterService.getLocalNode().id(); NodeId me = clusterService.getLocalNode().id();
@ -208,8 +208,8 @@ public class GossipIntentStore
} else if (isOrigin) { } else if (isOrigin) {
return master != null ? ImmutableList.of(master) : getRandomNode(); return master != null ? ImmutableList.of(master) : getRandomNode();
} else { } 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();
} }
} }