commit 6495e32fab94df925c5627c63cba904a46589f84
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Mon Jun 27 15:41:27 2016 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Tue Jun 28 19:06:22 2016 +0000
tree 91556a3438335c1361e3d37aeef491535ea3d7ee
parent 3be299449226bd58b91b6342ca88620847f9a72f

Fix NPE in LincOELambdaQuery.

- Fix for NPE issue reported by Jimmy Yan

Change-Id: Ie2dfea3fea7dec1bcff73549056f707b9e502b1a

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

diff --git a/drivers/optical/src/main/java/org/onosproject/driver/optical/query/LincOELambdaQuery.java b/drivers/optical/src/main/java/org/onosproject/driver/optical/query/LincOELambdaQuery.java
index 0d8cb45..9f7bada 100644
--- a/drivers/optical/src/main/java/org/onosproject/driver/optical/query/LincOELambdaQuery.java
+++ b/drivers/optical/src/main/java/org/onosproject/driver/optical/query/LincOELambdaQuery.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.driver.optical.query;
 
+import org.onlab.util.GuavaCollectors;
 import org.onosproject.net.ChannelSpacing;
 import org.onosproject.net.GridType;
 import org.onosproject.net.OchSignal;
@@ -24,9 +25,9 @@
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.driver.AbstractHandlerBehaviour;
 
-import java.util.Collections;
+import com.google.common.collect.ImmutableSet;
+
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 /**
@@ -42,19 +43,26 @@
 
     private static final int LAMBDA_COUNT = 80;
 
+    /**
+     * OMS ports expose 80 fixed grid lambdas of 50GHz width,
+     * centered around the ITU-T center frequency 193.1 THz.
+     */
+    private static final Set<OchSignal> OMS_LAMDAS = IntStream.range(0, LAMBDA_COUNT)
+            .mapToObj(x -> new OchSignal(GridType.DWDM, ChannelSpacing.CHL_50GHZ, x - (LAMBDA_COUNT / 2), 4))
+            .collect(GuavaCollectors.toImmutableSet());
+
     @Override
     public Set<OchSignal> queryLambdas(PortNumber port) {
         DeviceService deviceService = this.handler().get(DeviceService.class);
+
         Port p = deviceService.getPort(this.data().deviceId(), port);
 
         // OCh ports don't expose lambda resources
-        if (!p.type().equals(Port.Type.OMS)) {
-            return Collections.emptySet();
+        if (p == null ||
+            !p.type().equals(Port.Type.OMS)) {
+            return ImmutableSet.of();
         }
 
-        // OMS ports expose 80 fixed grid lambdas of 50GHz width, centered around the ITU-T center frequency 193.1 THz.
-        return IntStream.range(0, LAMBDA_COUNT)
-                .mapToObj(x -> new OchSignal(GridType.DWDM, ChannelSpacing.CHL_50GHZ, x - (LAMBDA_COUNT / 2), 4))
-                .collect(Collectors.toSet());
+        return OMS_LAMDAS;
     }
 }