홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Pavlin Radoslavov
808100b7 1 parent cdb24297

DistributedFlowRuleStore: getFlowEntries should never return null 

resoves ONOS-478

[Merged from master]

Change-Id: I3fd84088afd9c9f616858037829cac70708cc66e
(cherry picked from commit 24f79eb3)
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
...@@ -334,7 +334,7 @@ public class DistributedFlowRuleStore ...@@ -334,7 +334,7 @@ public class DistributedFlowRuleStore
334 } catch (IOException | TimeoutException | ExecutionException | InterruptedException e) { 334 } catch (IOException | TimeoutException | ExecutionException | InterruptedException e) {
335 log.warn("Unable to fetch flow store contents from {}", replicaInfo.master().get()); 335 log.warn("Unable to fetch flow store contents from {}", replicaInfo.master().get());
336 } 336 }
337 - return null; 337 + return Collections.emptyList();
338 } 338 }
339 339
340 private Set<FlowEntry> getFlowEntriesInternal(DeviceId deviceId) { 340 private Set<FlowEntry> getFlowEntriesInternal(DeviceId deviceId) {
......