summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smokowski <ks6305@att.com>2018-02-09 14:18:39 +0000
committerKevin Smokowski <ks6305@att.com>2018-02-09 14:26:37 +0000
commitd714334ac9e367173efa6801d531272f8c9eaed4 (patch)
treee3947b907c332db42493893400f442f485aa950f
parentbbf595ed4b60792db86de93aa3f9707082d5bb1a (diff)
CallNodeExecutor patch
Merging an old change that prevents a nullpointerexception when calledgraph is null Change-Id: I936afec383fcf4ba98e1d9d0a00c0d1e492766ca Issue-ID: CCSDK-185 Signed-off-by: Kevin Smokowski <ks6305@att.com>
-rw-r--r--sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java23
1 files changed, 10 insertions, 13 deletions
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java
index 72158e911..d11a2828d 100644
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/CallNodeExecutor.java
@@ -120,21 +120,18 @@ public class CallNodeExecutor extends SvcLogicNodeExecutor {
SvcLogicStore store = getStore();
if (store != null) {
- SvcLogicGraph calledGraph = store.fetch(module, rpc, version, mode);
- LOG.debug("Parent " + parentGraph + " is calling child " + calledGraph.toString());
- ctx.setAttribute("currentGraph", calledGraph.toString());
+ SvcLogicGraph calledGraph = store.fetch(module, rpc, version, mode);
if (calledGraph != null) {
- svc.execute(calledGraph, ctx);
-
- outValue = ctx.getStatus();
+ LOG.debug("Parent " + parentGraph + " is calling child " + calledGraph.toString());
+ ctx.setAttribute("currentGraph", calledGraph.toString());
+ svc.execute(calledGraph, ctx);
+ outValue = ctx.getStatus();
} else {
- LOG.error("Could not find service logic for [" + module + "," + rpc + "," + version + "," + mode + "]");
- }
- }
- else
- {
- LOG.debug("Could not get SvcLogicStore reference");
- }
+ LOG.debug("Parent " + parentGraph + " failed to call child [" + module + "," + rpc + "," + version + "," + mode + "] because the graph could not be found");
+ }
+ } else {
+ LOG.debug("Could not get SvcLogicStore reference");
+ }
SvcLogicNode nextNode = node.getOutcomeValue(outValue);
if (nextNode != null) {