From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 30 Aug 2017 16:03:01 +0000 (+0200)
Subject: Protect renderer vs cp.getPorts() == null
X-Git-Tag: v0.2.0~109
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2857e0980c6f02557d25c35e240aa09c9220d3d0;p=transportpce.git

Protect renderer vs cp.getPorts() == null

Otherwise it raises NullPointerException later in the process.

Change-Id: Icc662493b3239cecf790400f25b5970a570e9f8b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/mapping/PortMapping.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/mapping/PortMapping.java
index 1cd38e87d..560a00489 100644
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/mapping/PortMapping.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/mapping/PortMapping.java
@@ -237,7 +237,9 @@ public class PortMapping {
 
                 if (circuitPackObject.isPresent()) {
                     CircuitPacks cp = circuitPackObject.get();
-                    if (!cp.getPorts().isEmpty()) {
+                    if (cp.getPorts() == null) {
+                        LOG.warn("No port found for {} {}: {}", deviceInfo.getNodeId(), circuitPackName, cp);
+                    } else if (!cp.getPorts().isEmpty()) {
                         for (Ports port : cp.getPorts()) {
 
                             if (port.getLogicalConnectionPoint() != null && port.getPortQual().getIntValue() == 2) {