commit 62f8018c8be4fc556e2fe1b0683ae41822756708
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Jun 28 13:27:53 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jun 28 21:07:57 2016 +0000
tree 54e604e60dcf40708b8d468e9227f8f8c39f42c4
parent 4deb03b729204f3338139362255cc1307c503ece

[ONOS-4772] Avoid throwing NPE on optical resource queries.

Change-Id: I71ac76b7b456b19a8dabf78a0ef52366867cd230

drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java

diff --git a/drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java b/drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java
index 1d5ec1a..c424272 100644
--- a/drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java
+++ b/drivers/optical/src/main/java/org/onosproject/driver/optical/query/DefaultTributarySlotQuery.java
@@ -66,6 +66,10 @@
         DeviceService deviceService = opticalView(this.handler().get(DeviceService.class));
         Port p = deviceService.getPort(this.data().deviceId(), port);
 
+        if (p == null) {
+            return Collections.emptySet();
+        }
+
         switch (p.type()) {
             case OCH:
                 return queryOchTributarySlots(p);