commit ae4e5ed53b4bd9ccced37c165449b1c5a21edaf3
author Ray Milkey <ray@opennetworking.org> Wed Jan 17 15:24:52 2018 -0800
committer Ray Milkey <ray@opennetworking.org> Thu Jan 25 14:23:59 2018 -0800
tree cfafedc21c6b7554f82d67f062ddec922aab4539
parent a5d31a613aa14db8bf01b8fcdd8427ed0cd1f878

Sonar suggestions - fixes to potential null pointer dereferences

Change-Id: I4e350a9d72a9322971d5d4f831f1bdf167986b87

apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java

diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java
index f9ee752..ee5ac99 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java
@@ -93,7 +93,7 @@
         }
 
         OpticalPortConfig opc = lookupConfig(cp);
-        if (opc == null) {
+        if (descr == null || opc == null) {
             return descr;
         }