Added fix for potential nullpointer exception 09/73909/1
authorChandan Ghosh <cghosh12@in.ibm.com>
Thu, 29 Nov 2018 11:29:38 +0000 (16:59 +0530)
committerChandan Ghosh <cghosh12@in.ibm.com>
Thu, 29 Nov 2018 11:29:45 +0000 (16:59 +0530)
Added fix for potential nullpointerexception reported in sonar

Issue-ID: CCSDK-767
Change-Id: Ifebf7a57f27cb0de83d3cd5e805e0547b28ee845
Signed-off-by: Chandan Ghosh <cghosh12@in.ibm.com>
resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ResourceAllocator.java

index 5700cd7..e31ce7e 100644 (file)
@@ -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);