commit 0a9e0aa909d6d78680ec3d7ed4c87c7e57f32309
author Ray Milkey <ray@opennetworking.org> Wed Jan 23 14:37:46 2019 -0800
committer Ray Milkey <ray@opennetworking.org> Wed Jan 23 23:16:40 2019 +0000
tree 986c23fd8789bd6da3b8181a9304cb22f1d5e7da
parent a1f8e193e2bad82a9de5de30a2d7840e14e5df15

Sonar suggestions for avoiding NPEs

Change-Id: I935969ecaae590a1a1569defc5a3f143b76fa2e2

drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java

diff --git a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
index f06c0b4..0127f43 100644
--- a/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
+++ b/drivers/odtn-driver/src/main/java/org/onosproject/drivers/odtn/tapi/TapiDeviceLambdaQuery.java
@@ -85,10 +85,12 @@
         Device dev = deviceService.getDevice(deviceId);
         if (dev == null) {
             log.error("Device {} does not exist", deviceId);
+            return ImmutableSet.of();
         }
         Port p = deviceService.getPort(dev.id(), port);
         if (p == null) {
             log.error("Port {} does not exist", port);
+            return ImmutableSet.of();
         }
         String uuid = p.annotations().value(port.toString());