summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2018-11-30 20:17:39 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-30 20:17:39 +0000
commit2cdcabee378b26873e950e9e96a7b7145dd9cc4e (patch)
tree49390048bbdd77f66ce3c1966a4ba356e33213b3
parent1e7ab24c2c730f6e6488f9e80957b69de7dbc81e (diff)
parent7c7fee89720151ec426aba3a928df2ad71dd8077 (diff)
Merge "Added fix for potential nullpointer exception"
-rw-r--r--resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/ra/ResourceAllocator.java2
1 files changed, 1 insertions, 1 deletions
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 5700cd72a..e31ce7ec2 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);