Update variable mediator with Synapse expression evaluation changes

wso2 · Dec 2, 2024 · ce786b3 · ce786b3
1 parent c17a92f
commit ce786b3
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/v2/VariableMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/v2/VariableMediator.java
@@ -169,12 +169,27 @@ private Object getResultValue(MessageContext synCtx) {
             return value;
         } else {
             if (expression != null) {
+                if (isOMType(type)) {
+                    return buildOMElement(expression.stringValueOf(synCtx));
+                } else if (isStringType(type)) {
+                    return expression.stringValueOf(synCtx);
+                }
                 return convertExpressionResult(expression.objectValueOf(synCtx), type);
             }
         }
         return null;
     }
 
+    private boolean isOMType(String type) {
+
+        return type != null && XMLConfigConstants.DATA_TYPES.OM.equals(XMLConfigConstants.DATA_TYPES.valueOf(type));
+    }
+
+    private boolean isStringType(String type) {
+
+        return type != null && XMLConfigConstants.DATA_TYPES.STRING.equals(XMLConfigConstants.DATA_TYPES.valueOf(type));
+    }
+
     private Object convertValue(String value, String type) {
 
         if (type == null) {