commit 24f79eb3f3a97f268c04342f86018bf34d0e2e26
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Fri Dec 12 15:46:43 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Sat Dec 13 02:47:51 2014 +0000
tree e565fd30735a885828d80292fe02ae42fb273a3d
parent 800fac669f61e0e6f8d620c8dae563bc3fe0c4fd

DistributedFlowRuleStore: getFlowEntries should never return null

resoves ONOS-478

Change-Id: I3fd84088afd9c9f616858037829cac70708cc66e

core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
index 6d2dcf3..1f9c708 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
@@ -330,7 +330,7 @@
         } catch (IOException | TimeoutException | ExecutionException | InterruptedException e) {
             log.warn("Unable to fetch flow store contents from {}", replicaInfo.master().get());
         }
-        return null;
+        return Collections.emptyList();
     }
 
     private Set<FlowEntry> getFlowEntriesInternal(DeviceId deviceId) {