From: surya-huawei <a.u.surya@huawei.com>
Date: Wed, 20 Sep 2017 06:52:35 +0000 (+0530)
Subject: Fix Sonar Issue in sli/adaptors module
X-Git-Tag: v0.1.0~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d1ed09daa141268d0cb830f5060e9463719d1eba;p=ccsdk%2Fsli%2Fadaptors.git

Fix Sonar Issue in sli/adaptors module

One blocker issue
*Checking for a null dereferencing
This is to avoid NullPointerException

Issue-Id: CCSDK-87
Change-Id: Ie2192636e3ad8dfa9643cac61b3086c3cd33f126
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
---

diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceDaoImpl.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceDaoImpl.java
index 7db37fff..58f10365 100644
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceDaoImpl.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceDaoImpl.java
@@ -331,14 +331,16 @@ public class ResourceDaoImpl implements ResourceDao {
             ai = rai;
         }
 
-        ai.resourceType = r.resourceType;
-        ai.resourceKey = r.resourceKey;
-        ai.resourceSetId = aiEntity.resourceSetId;
-        ai.resourceUnionId = aiEntity.resourceUnionId;
-        if (aiEntity.resourceShareGroupList != null)
-            ai.resourceShareGroupList = new HashSet<String>(StrUtil.listStr(aiEntity.resourceShareGroupList));
-        ai.applicationId = aiEntity.applicationId;
-        ai.allocationTime = aiEntity.allocationTime;
+        if (ai!=null) {
+            ai.resourceType = r.resourceType;
+            ai.resourceKey = r.resourceKey;
+            ai.resourceSetId = aiEntity.resourceSetId;
+            ai.resourceUnionId = aiEntity.resourceUnionId;
+            if (aiEntity.resourceShareGroupList != null)
+                ai.resourceShareGroupList = new HashSet<String>(StrUtil.listStr(aiEntity.resourceShareGroupList));
+            ai.applicationId = aiEntity.applicationId;
+            ai.allocationTime = aiEntity.allocationTime;
+        }
 
         return ai;
     }