svn commit: r1075288 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java

[supun]

Author: supun
Date: Mon Feb 28 11:03:09 2011
New Revision: 1075288

URL: http://svn.apache.org/viewvc?rev=1075288&view=rev
Log:
fixing an issue with specifying a receiving sequence, previously after 
executing the receiving sequence it executes the main sequence as well

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=1075288&r1=1075287&r2=1075288&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
 Mon Feb 28 11:03:09 2011
@@ -156,10 +156,6 @@ public class Axis2SynapseEnvironment imp
         // if this is not a response to a proxy service
         String proxyName = (String) 
synCtx.getProperty(SynapseConstants.PROXY_SERVICE);
         if (proxyName == null || "".equals(proxyName)) {
-            if (log.isDebugEnabled()) {
-                log.debug("Using Main Sequence for injected message");
-            }
-
             if (receivingSequence != null) {
                 if (log.isDebugEnabled()) {
                     log.debug("Using Sequence with name: " + receivingSequence
@@ -167,7 +163,7 @@ public class Axis2SynapseEnvironment imp
                 }
                 Mediator seqMediator = synCtx.getSequence(receivingSequence);
                 if (seqMediator != null) {
-                    seqMediator.mediate(synCtx);
+                    return seqMediator.mediate(synCtx);
                 } else {
                     log.warn("Cannot find a Sequence with name: " + 
receivingSequence
                             + " for injecting the response message");
@@ -175,12 +171,11 @@ public class Axis2SynapseEnvironment imp
                 }
             } else {
                 if (log.isDebugEnabled()) {
-                    log.debug("Using a Sequence for injected message");
+                    log.debug("Using Main Sequence for injected message");
                 }
                 return synCtx.getMainSequence().mediate(synCtx);
             }
 
-            return synCtx.getMainSequence().mediate(synCtx);
         }
 
         ProxyService proxyService = 
synCtx.getConfiguration().getProxyService(proxyName);