From: Chandan Ghosh <cghosh12@in.ibm.com>
Date: Thu, 29 Nov 2018 11:29:38 +0000 (+0530)
Subject: Added fix for potential nullpointer exception
X-Git-Tag: 0.4.0~29^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7c7fee89720151ec426aba3a928df2ad71dd8077;p=ccsdk%2Fsli%2Fadaptors.git

Added fix for potential nullpointer exception

Added fix for potential nullpointerexception reported in sonar

Issue-ID: CCSDK-767
Change-Id: Ifebf7a57f27cb0de83d3cd5e805e0547b28ee845
Signed-off-by: Chandan Ghosh <cghosh12@in.ibm.com>
---

diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ResourceAllocator.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ResourceAllocator.java
index 5700cd72..e31ce7ec 100644
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ResourceAllocator.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ResourceAllocator.java
@@ -146,7 +146,7 @@ public class ResourceAllocator implements SvcLogicResource {
             ResourceData rd = endPointAllocator.getResource(rt.resourceTargetType, rt.resourceTargetId, rr.resourceName,
                     rr.resourceEntityTypeFilter, rr.resourceEntityIdFilter, rr.resourceShareGroupFilter);
             setResourceDataInResponse(Collections.singletonList(rd), rsList);
-        } else if ((rr.resourceTargetTypeFilter != null || rr.resourceTargetIdFilter != null)
+        } else if ((rr!=null && rr.resourceTargetTypeFilter != null || rr.resourceTargetIdFilter != null)
                 && rr.resourceName != null) {
             List<ResourceData> rdlist = endPointAllocator.getResourcesForTarget(rr.resourceTargetTypeFilter,
                     rr.resourceTargetIdFilter, rr.resourceName);