Bugfix for DeviceStores

- Should never return null, when return type is a Collection Change-Id: I85eb27bf702b5e76facf83db29ab264cf85a6755

Bugfix for DeviceStores
- Should never return null, when return type is a Collection Change-Id: I85eb27bf702b5e76facf83db29ab264cf85a6755
HIGUCHI Yuta · Gerrit Code Review
Commit 8946177548ff6bba9b1c9350ecfcfcc871de3878 89461775 1 parent 7cfd4433
Showing 2 changed files with 2 additions and 2 deletions
core/store/dist/src/main/java/org/onosproject/store/device/impl/ECDeviceStore.java
core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/ECDeviceStore.java
View file @8946177
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/ECDeviceStore.java
View file @8946177
@@ -422,7 +422,7 @@ public class ECDeviceStore
             // Only forward for ConfigProvider
             // Forwarding was added as a workaround for ONOS-490
             if (!providerId.scheme().equals("cfg")) {
-                return null;
+                return Collections.emptyList();
             }
             if (master == null) {
                 return Collections.emptyList();
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
View file @8946177
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
View file @8946177
@@ -586,7 +586,7 @@ public class GossipDeviceStore
             // Only forward for ConfigProvider
             // Forwarding was added as a workaround for ONOS-490
             if (!providerId.scheme().equals("cfg")) {
-                return null;
+                return Collections.emptyList();
             }
             // FIXME Temporary hack for NPE (ONOS-1171).
             // Proper fix is to implement forwarding to master on ConfigProvider