commit 27e1b923ac65188ca9f6bc17c56ff77d62e031bc
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri Jan 15 22:47:44 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Jan 19 19:31:34 2016 +0000
tree 94398677d4da19eec949be8bed95c004302e79d2
parent 352397314209fc7b3606e1dc8c02c095e5f06aea

Make return value null-safe

Change-Id: Ia56fac56ef8c036328ef6804386c0f86bd157f8f

core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java

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 4b8d20d..3636f14 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
@@ -217,8 +217,8 @@
                 .map(ControllerNode::id)
                 .filter(node -> !Objects.equals(node, me))
                 .collect(Collectors.toList());
-        if (nodes.size() == 0) {
-            return null;
+        if (nodes.isEmpty()) {
+            return ImmutableList.of();
         }
         return ImmutableList.of(nodes.get(RandomUtils.nextInt(nodes.size())));
     }