Author: ruwan
Date: Fri Feb 26 00:48:10 2010
New Revision: 916505
URL: http://svn.apache.org/viewvc?rev=916505&view=rev
Log:
Fixing the ussye SYNAPSE-612, by applying the patch from Amila
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java?rev=916505&r1=916504&r2=916505&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
Fri Feb 26 00:48:10 2010
@@ -33,6 +33,7 @@
import org.apache.axis2.transport.base.threads.WorkerPool;
import org.apache.axis2.transport.base.threads.WorkerPoolFactory;
import org.apache.axis2.util.MessageContextBuilder;
+import org.apache.axis2.util.JavaUtils;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,6 +55,7 @@
import org.apache.http.params.DefaultedHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.*;
+import org.apache.sandesha2.Sandesha2Constants;
import org.apache.synapse.transport.nhttp.debug.ClientConnectionDebug;
import java.io.IOException;
@@ -383,6 +385,15 @@
final MessageContext mc = axis2Request.getMsgContext();
+ // if the request message is a sandesha messag we ignore the
+ // exception handling
+ // we cannot use the declared sandesha2 constant since
+ // nhttp transport shouldn't take a sandesha2 dependency
+ String done = (String) mc.getProperty("Sandesha2AppProcessingDone");
+ if (JavaUtils.isTrueExplicitly(done)) {
+ return;
+ }
+
if (mc.getAxisOperation() != null &&
mc.getAxisOperation().getMessageReceiver() != null) {
