Merge "Fix blocker sonar issue in sli/core"
diff --git a/dblib/README.md b/dblib/README.md
index 98e8f0c..ab2c513 100755
--- a/dblib/README.md
+++ b/dblib/README.md
@@ -3,4 +3,4 @@
DBLIB utility is designed as a high availability connection manager.
It is configured to use multiple databases, and based on the configured rules
-always provide the connection to te active database.
+always provide the connection to the active database.
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
index dd7139a..c5a848a 100755
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
@@ -154,8 +154,6 @@
LOG.info("About to execute graph {}", graph.toString());
try {
while (curNode != null) {
- MDC.put("nodeId", curNode.getNodeId() + " (" + curNode.getNodeType() + ")");
- LOG.info("About to execute node # {} ({})", curNode.getNodeId(), curNode.getNodeType());
SvcLogicNode nextNode = executeNode(curNode, ctx);
curNode = nextNode;
@@ -174,6 +172,8 @@
return (null);
}
+ LOG.info("About to execute node # {} ({})", node.getNodeId(), node.getNodeType());
+
if (LOG.isDebugEnabled()) {
LOG.debug("Executing node {}", node.getNodeId());
}
@@ -183,6 +183,8 @@
if (executor != null) {
LOG.debug("Executing node executor for node type {} - {}", node.getNodeType(),
executor.getClass().getName());
+
+ MDC.put("nodeId", node.getNodeId() + " (" + node.getNodeType() + ")");
return (executor.execute(this, node, ctx));
} else {
throw new SvcLogicException("Attempted to execute a node of type " + node.getNodeType() + ", but no executor was registered for this type");