Merge "Removed slashes and added catch block" into casablanca

1 files changed, 6 insertions, 4 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOut.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOut.java
index d13c5db871..58dd5a1df6 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOut.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOut.java
@@ -95,10 +95,13 @@ public class ConfigurationScaleOut {
 					for (Map.Entry<String,String> entry : param.entrySet()) {
 						key = entry.getKey();
 						paramValue = entry.getValue();
-						configScaleOutParam = JsonPath.parse(sdncVfModuleQueryResponse).read(paramValue);
-						if(configScaleOutParam != null){
-							paramsMap.put(key, configScaleOutParam);
+						try{
+							configScaleOutParam = JsonPath.parse(sdncVfModuleQueryResponse).read(paramValue);
+						}catch(ClassCastException e){
+							configScaleOutParam = null;
+							msoLogger.warnSimple("Incorrect JSON path. Path points to object rather than value causing: ", e);
 						}
+						paramsMap.put(key, configScaleOutParam);
 					}
 				}
 			}
@@ -107,7 +110,6 @@ public class ConfigurationScaleOut {
 			configPayload.setConfigurationParameters(paramsMap);
 			configPayload.setRequestParameters(requestParameters);
 			configScaleOutPayloadString = mapper.writeValueAsString(configPayload);
-			configScaleOutPayloadString = configScaleOutPayloadString.replaceAll("\"", "\\\\\"");
 			
 			execution.setVariable(ACTION, actionCategory);
 			execution.setVariable(MSO_REQUEST_ID, gBBInput.getRequestContext().getMsoRequestId());