diff options
| author |   Kevin Smokowski <ks6305@att.com> | 2017-05-25 20:54:07 +0000 |
|---|---|---|
| committer | Kevin Smokowski <ks6305@att.com> | 2017-05-25 21:21:01 +0000 |
| commit | dda3edb6257146ab6599bfd44658a9791037511d (patch) | |
| tree | 00ec4db2bb8f4809d13ecb18d8b0b027f24efccd /sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java | |
| parent | e69f794b32db291ace90ac7934e7938bc79d815e (diff) | |
SDNC-11 merge
Change-Id: I8ac404a2a13469d77f117fd1d90162e5b7c4f7a0
Signed-off-by: Kevin Smokowski <ks6305@att.com>
Diffstat (limited to 'sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java')
| -rw-r--r-- | sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java index b6fa374..a500b6f 100644 --- a/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java +++ b/sli/provider/src/main/java/org/openecomp/sdnc/sli/provider/CallNodeExecutor.java @@ -78,16 +78,7 @@ public class CallNodeExecutor extends SvcLogicNodeExecutor { { rpc = SvcLogicExpressionResolver.evaluate(rpcExpr, node, ctx); } - - if ((rpc == null) || (rpc.length() == 0)) - { - if (myGraph != null) - { - rpc = myGraph.getRpc(); - LOG.debug("myGraph.getRpc() returned "+rpc); - } - } - + String mode = null; moduleExpr = node.getAttribute("mode"); @@ -122,8 +113,8 @@ public class CallNodeExecutor extends SvcLogicNodeExecutor { if (store != null) { SvcLogicGraph calledGraph = store.fetch(module, rpc, version, mode); if (calledGraph != null) { - LOG.debug("Parent " + parentGraph + " is calling child " + calledGraph.toString()); svc.execute(calledGraph, ctx); + LOG.debug("Parent " + parentGraph + " is calling child " + calledGraph.toString()); ctx.setAttribute("currentGraph", calledGraph.toString()); outValue = ctx.getStatus(); } else { |