commit eeb95106f8db22b42da0b11f6a56bb387ee61742
author Ayaka Koshibe <ayaka@onlab.us> Thu Feb 26 16:31:49 2015 -0800
committer Ray Milkey <ray@onlab.us> Fri Feb 27 05:33:57 2015 +0000
tree 10d709f17e03538e4ab39e7499129cecbcb7bf13
parent 3ab202835d532887744eed3265c4ce5a5403bee9

ONOS-1114 - NPE for EQUAL switch reconnection

Change-Id: Id5d6f40610bdf4f97e65313c33a91c85678b153b

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 8a61fc4..56d01a0 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
@@ -21,6 +21,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
@@ -549,7 +550,7 @@
             // redo ONOS-490
             if (deviceNode == null) {
                 // silently ignore
-                return null;
+                return Collections.emptyList();
             }
 
             PortInjectedEvent portInjectedEvent = new PortInjectedEvent(providerId, deviceId, portDescriptions);
@@ -564,7 +565,7 @@
             }
         }
 
-        return deviceEvents;
+        return deviceEvents == null ? Collections.emptyList() : deviceEvents;
     }
 
     private List<DeviceEvent> updatePortsInternal(ProviderId providerId,