commit 208bcb32cc95018b008c304a15cce7d273f74b82
author Ray Milkey <ray@opennetworking.org> Thu Nov 15 10:22:44 2018 -0800
committer Thomas Vachuska <tom@opennetworking.org> Thu Nov 15 22:04:37 2018 +0000
tree 9b42da75425f01bdd5076f8dbf7ffeaf8fb0b12a
parent f714db4cabb32ee6b09569a28d4671dfdd883de9

Fix NPE when there is no port name available

Change-Id: I995229a2c8d34e44d3f07cb2b22deb182c5af3d1

providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java

diff --git a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
index e79f58e..f2cfdcd 100644
--- a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
+++ b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
@@ -332,6 +332,9 @@
     private Optional<Port> findSourcePortByName(String remotePortName,
                                                 DeviceService deviceService,
                                                 Device remoteDevice) {
+        if (remotePortName == null) {
+            return Optional.empty();
+        }
         Optional<Port> remotePort = deviceService.getPorts(remoteDevice.id())
                 .stream().filter(port -> Objects.equals(remotePortName,
                                                         port.annotations().value(AnnotationKeys.PORT_NAME)))