commit 0a669b234ba8c82fe3a9b41881d775f55d4857be
author Thomas Vachuska <tom@onlab.us> Tue Feb 14 10:45:52 2017 -0800
committer Thomas Vachuska <tom@onlab.us> Wed Feb 15 18:21:39 2017 +0000
tree 6719c9a0ce8709c696482e234bdd43082183aedc
parent 08a3b3069a34308bf6a50d4ee1be63d9d2ada98d

Fixing NPE on cluster restart.

Change-Id: I94e987ae544c63ccafbe8e2cd2eea662123eb019

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 4e6c05d..93fe74f 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
@@ -616,6 +616,7 @@
                 final DeviceDescriptions descs = device.get(providerId);
                 List<PortDescription> mergedList =
                         FluentIterable.from(portDescriptions)
+                                .filter(input -> input.portNumber() != null)
                                 .transform(input ->
                                     // lookup merged port description
                                     descs.getPortDesc(input.portNumber()).value()