From: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Date: Fri, 25 May 2018 14:37:10 +0000 (+0200)
Subject: Fix potential NPE
X-Git-Tag: v2.0.1~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=clamp.git;a=commitdiff_plain;h=3cc407a7d1aa3bd425cf0bcbd109db40fb509ab1

Fix potential NPE

Fix policyversion that can be null in getConfig method

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

diff --git a/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java b/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java
index 9fff4efc..1e423ffe 100644
--- a/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java
+++ b/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java
@@ -336,8 +336,12 @@ public class PolicyClient {
         try {
             Collection<PolicyConfig> response = getPolicyEngine().getConfig(configRequestParameters);
             for (PolicyConfig policyConfig : response) {
-                Integer version = Integer.valueOf(policyConfig.getPolicyVersion());
-                versions.add(version);
+                if (policyConfig.getPolicyVersion() != null) {
+                    Integer version = Integer.valueOf(policyConfig.getPolicyVersion());
+                    versions.add(version);
+                } else {
+                    logger.warn("Policy version was null, unable to convert it to Integer");
+                }
             }
             Collections.sort(versions);
             logger.info("Policy versions.size()=" + versions.size());