From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Wed, 30 Aug 2017 14:31:31 +0000 (-0700)
Subject: Fix a blocker issue reported by SOnar
X-Git-Tag: v1.1.0~112
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F9445%2F1;p=clamp.git

Fix a blocker issue reported by SOnar

Add a test to return a value that could potentially be null

Change-Id: I092ba4f21775ae64aa86f8dbff8538e47ca16c43
Issue-Id: CLAMP-43
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---

diff --git a/src/main/java/org/onap/clamp/clds/model/CldsModel.java b/src/main/java/org/onap/clamp/clds/model/CldsModel.java
index a830f938..7eac3d92 100644
--- a/src/main/java/org/onap/clamp/clds/model/CldsModel.java
+++ b/src/main/java/org/onap/clamp/clds/model/CldsModel.java
@@ -300,8 +300,9 @@ public class CldsModel {
      */
     public static CldsModel createUsingControlName(String fullControlName) {
         if (fullControlName == null || fullControlName.length() < UUID_LENGTH) {
-            throw new BadRequestException("closed loop id / control name length, " + fullControlName.length()
-                    + ", less than the minimum of: " + UUID_LENGTH);
+            throw new BadRequestException(
+                    "closed loop id / control name length, " + (fullControlName != null ? fullControlName.length() : 0)
+                            + ", less than the minimum of: " + UUID_LENGTH);
         }
         CldsModel model = new CldsModel();
         model.setControlNamePrefix(fullControlName.substring(0, fullControlName.length() - UUID_LENGTH));