Fix Sonar Issue 17/13317/1
authorsurya-huawei <a.u.surya@huawei.com>
Tue, 19 Sep 2017 06:40:28 +0000 (12:10 +0530)
committersurya-huawei <a.u.surya@huawei.com>
Tue, 19 Sep 2017 06:43:49 +0000 (12:13 +0530)
One blocker issue in sli/adapters module
*check for null dereferencing

Issue-Id: CCSDK-87
Change-Id: I6c2b308bed95069089770cbec7ef728e2a8cc030
Signed-off-by: surya-huawei <a.u.surya@huawei.com>
resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/dao/jdbc/ResourceDaoImpl.java

index 9ee3cc1..7db37ff 100644 (file)
@@ -298,10 +298,12 @@ public class ResourceDaoImpl implements ResourceDao {
             r = rr;
         }
 
-        r.resourceType = type;
-        r.resourceKey = new ResourceKey();
-        r.resourceKey.assetId = resourceEntity.assetId;
-        r.resourceKey.resourceName = resourceEntity.name;
+        if (r != null) {
+            r.resourceType = type;
+            r.resourceKey = new ResourceKey();
+            r.resourceKey.assetId = resourceEntity.assetId;
+            r.resourceKey.resourceName = resourceEntity.name;
+        }
 
         return r;
     }