Merge pull request #2170 from DedunuKarunarathne/fix-json-path

Fix enrich mediator not failing when incorrect json is parsed
wso2 · Mar 28, 2024 · 916603f · 916603f
2 parents 087a779 + 527d86b
commit 916603f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java b/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java
@@ -106,8 +106,10 @@ private static String replaceValue(MessageContext messageContext, String text, b
             }
             // If the string is neither XML or JSON, it is considered a String and must be wrapped in double quotes
             // If it is an empty string returned from a json-eval expression it must be wrapped in double quotes
-            if (isInline && ((value.isEmpty() && matchSeq.contains(EXPRESSION_JSON_EVAL))
-                    || (!isValidXML(value) && !isValidJson(value) && !isSurroundedByQuotes(surroundedString)))) {
+            if (isInline && (
+                    (value.isEmpty() && matchSeq.contains(EXPRESSION_JSON_EVAL)) ||
+                    (!isValidXML(value) && !isValidJson(value) && (value.isEmpty() || !isSurroundedByQuotes(surroundedString)))
+            )) {
                 value = "\"" + value + "\"";
             }
             text = text.replace(matchSeq, value);