Committed by
Gerrit Code Review
Improving null safety of GossipIntentStore peer update function
Change-Id: I4f517d899c98f7c6cd0964465dfbcebae17363a3
Showing
1 changed file
with
3 additions
and
3 deletions
... | @@ -195,7 +195,7 @@ public class GossipIntentStore | ... | @@ -195,7 +195,7 @@ public class GossipIntentStore |
195 | NodeId origin = (data != null) ? data.origin() : null; | 195 | NodeId origin = (data != null) ? data.origin() : null; |
196 | if (master == null || origin == null) { | 196 | if (master == null || origin == null) { |
197 | log.warn("Intent {} has no home; master = {}, origin = {}", | 197 | log.warn("Intent {} has no home; master = {}, origin = {}", |
198 | - data.key(), master, origin); | 198 | + key, master, origin); |
199 | } | 199 | } |
200 | 200 | ||
201 | NodeId me = clusterService.getLocalNode().id(); | 201 | NodeId me = clusterService.getLocalNode().id(); |
... | @@ -208,8 +208,8 @@ public class GossipIntentStore | ... | @@ -208,8 +208,8 @@ public class GossipIntentStore |
208 | } else if (isOrigin) { | 208 | } else if (isOrigin) { |
209 | return master != null ? ImmutableList.of(master) : getRandomNode(); | 209 | return master != null ? ImmutableList.of(master) : getRandomNode(); |
210 | } else { | 210 | } else { |
211 | - log.warn("Not master or origin for intent {}", data.key()); | 211 | + log.warn("Not master or origin for intent {}", key); |
212 | - return ImmutableList.of(master); | 212 | + return master != null ? ImmutableList.of(master) : getRandomNode(); |
213 | } | 213 | } |
214 | } | 214 | } |
215 | 215 | ... | ... |
-
Please register or login to post a comment