commit 6de4fb9469f6d7eaab5111fdbb4e17750f221f2a
author Donghyeok Ho <donghyeok.ho@samsung.com> Wed Jan 31 11:04:19 2018 +0900
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Tue Feb 06 04:35:01 2018 +0000
tree ee4a4961878314c63e9bf8d9f3729fa6c012fa55
parent 1c2881d031c8f7fce1926b5913df17d06779bf86

[ONOS-7409] Fixing NullPointerException when DeviceManager handles deviceDisconnected

Change-Id: I48320f447822c543aa970f72cc1fe0f0d0939f9d

core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index ded0f31..7c23823 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -867,7 +867,7 @@
                                                        DeviceId deviceId) {
         Map<ProviderId, DeviceDescriptions> descs = this.deviceDescs.get(deviceId);
         if (descs == null) {
-            return null;
+            return Stream.empty();
         }
         // inner-Map(=descs) is HashMap, thus requires synchronization even for reads
         final Optional<DeviceDescriptions> devDescs;