Merge pull request #2229 from SanojPunchihewa/variable

Copy variables to cloned messages and callback messages
wso2 · Nov 6, 2024 · 3f7d461 · 3f7d461
2 parents 651cd57 + b3757b7
commit 3f7d461
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
@@ -576,7 +576,12 @@ private void handleMessage(String messageID ,MessageContext response,
                         synapseInMessageContext.setProperty(
                                 (String) key, synapseOutMsgCtx.getProperty((String) key));
                     }
-
+
+                    for (Object key : synapseOutMsgCtx.getVariableKeySet()) {
+                        synapseInMessageContext.setVariable(
+                                (String) key, synapseOutMsgCtx.getVariable((String) key));
+                    }
+
                     if(failOver){
                     	 //we may required to handle same message for failover cases only other than that 
                     	 //should treat based on the incoming message
@@ -615,6 +620,11 @@ private void handleMessage(String messageID ,MessageContext response,
                         (String) key, synapseOutMsgCtx.getProperty((String) key));
             }
 
+            for (Object key : synapseOutMsgCtx.getVariableKeySet()) {
+                synapseInMessageContext.setVariable(
+                        (String) key, synapseOutMsgCtx.getVariable((String) key));
+            }
+
             if (successfulEndpoint instanceof OAuthConfiguredHTTPEndpoint) {
 
                 OAuthConfiguredHTTPEndpoint httpEndpoint = (OAuthConfiguredHTTPEndpoint) successfulEndpoint;

diff --git a/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java b/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
@@ -207,6 +207,19 @@ public static MessageContext cloneMessageContext(MessageContext synCtx, boolean
             }
         }
 
+        // copy all the variables to the newCtx
+        for (Object o : synCtx.getVariableKeySet()) {
+            String strkey = (String) o;
+            Object obj = synCtx.getVariable(strkey);
+            if (obj instanceof OMElement) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Deep clone for OMElement");
+                }
+                obj = ((OMElement) obj).cloneOMElement();
+            }
+            newCtx.setVariable(strkey, obj);
+        }
+
         // Make deep copy of fault stack so that parent will not be lost it's fault stack
         Stack<FaultHandler> faultStack = synCtx.getFaultStack();
         if (!faultStack.isEmpty()) {