Add the fix in synapse PR 1484 again which is reverted by PR 1719

shilmyhasan · May 12, 2023 · 1626fbd · 1626fbd
1 parent 1d4ea09
commit 1626fbd
Showing 1 changed file with 2 additions and 4 deletions.
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
@@ -177,7 +177,6 @@ public void receive(MessageContext messageCtx) throws AxisFault {
             }
 
             if (callback != null) {
-                messageCtx.removeProperty(PassThroughConstants.INTERNAL_EXCEPTION_ORIGIN);
                 org.apache.synapse.MessageContext SynapseOutMsgCtx = callback.getSynapseOutMsgCtx();
                 ConcurrencyThrottlingUtils.decrementConcurrencyThrottleAccessController(SynapseOutMsgCtx);
 
@@ -187,7 +186,7 @@ public void receive(MessageContext messageCtx) throws AxisFault {
                     }
                     callback.setMarkedForRemoval();
                 }
-
+                messageCtx.removeProperty(PassThroughConstants.INTERNAL_EXCEPTION_ORIGIN);
                 if (RuntimeStatisticCollector.isStatisticsEnabled()) {
                     CallbackStatisticCollector.updateParentsForCallback(SynapseOutMsgCtx, messageID);
                     handleMessage(messageID, messageCtx, SynapseOutMsgCtx, (AsyncCallback) callback);
@@ -206,7 +205,6 @@ public void receive(MessageContext messageCtx) throws AxisFault {
                             + " and correlation_id : " + messageCtx.getProperty(CorrelationConstants.CORRELATION_ID)
                             + " But a callback is not registered (anymore) to process " + "this response");
                 }
-                messageCtx.removeProperty(PassThroughConstants.INTERNAL_EXCEPTION_ORIGIN);
             }
 
         } else if (!messageCtx.isPropertyTrue(NhttpConstants.SC_ACCEPTED)){
@@ -519,7 +517,7 @@ private void handleMessage(String messageID ,MessageContext response,
                     		failOver =true;
                     	}
                     }
-                    
+
                  // set the properties of the original MC to the new MC
 
                     for (Object key : synapseOutMsgCtx.getPropertyKeySet()) {