Author: hiranya
Date: Mon Aug 12 05:46:56 2013
New Revision: 1513043

URL: http://svn.apache.org/r1513043
Log:
Fixing a bug in the pass thru http sender (transport was setting the 
RESPONSE_WRITTEN property to true on outgoing requests). Cleaned up some unused 
configurations.

Modified:
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
    synapse/trunk/java/repository/conf/axis2.xml

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java?rev=1513043&r1=1513042&r2=1513043&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java
 Mon Aug 12 05:46:56 2013
@@ -320,13 +320,14 @@ public class PassThroughHttpSender exten
             } else {
                 handleException("No valid destination EPR to send message");
             }
-        }
 
-        if (msgContext.getOperationContext() != null) {
-            msgContext.getOperationContext().setProperty(
-                Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
+            if (msgContext.getOperationContext() != null) {
+                msgContext.getOperationContext().setProperty(
+                        Constants.RESPONSE_WRITTEN, Constants.VALUE_TRUE);
+            }
         }
 
+
         return InvocationResponse.CONTINUE;
     }
     

Modified: synapse/trunk/java/repository/conf/axis2.xml
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/axis2.xml?rev=1513043&r1=1513042&r2=1513043&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/axis2.xml (original)
+++ synapse/trunk/java/repository/conf/axis2.xml Mon Aug 12 05:46:56 2013
@@ -188,7 +188,6 @@
     <!-- the non blocking http transport based on HttpCore + NIO extensions -->
     <transportReceiver name="http" 
class="org.apache.synapse.transport.passthru.PassThroughHttpListener">
         <parameter name="port">8280</parameter>
-        <parameter name="non-blocking">true</parameter>
            <parameter name="httpGetProcessor" 
locked="false">org.apache.synapse.transport.passthru.api.PassThroughNHttpGetProcessor</parameter>
         <!--parameter name="bind-address" locked="false">hostname or IP 
address</parameter-->
         <!--parameter name="WSDLEPRPrefix" 
locked="false">https://apachehost:port/somepath</parameter-->
@@ -198,7 +197,6 @@
     <!-- the non blocking https transport based on HttpCore + SSL-NIO 
extensions -->
     <transportReceiver name="https" 
class="org.apache.synapse.transport.passthru.PassThroughHttpSSLListener">
         <parameter name="port" locked="false">8243</parameter>
-        <parameter name="non-blocking" locked="false">true</parameter>
         <parameter name="httpGetProcessor" 
locked="false">org.apache.synapse.transport.passthru.api.PassThroughNHttpGetProcessor</parameter>
         <!--parameter name="bind-address" locked="false">hostname or IP 
address</parameter-->
         <!--parameter name="WSDLEPRPrefix" 
locked="false">http://apachehost:port/somepath</parameter-->
@@ -287,15 +285,11 @@
     <!-- ================================================= -->
 
     <transportSender name="http"  
class="org.apache.synapse.transport.passthru.PassThroughHttpSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="warnOnHTTP500" locked="false">*</parameter>
         <!--parameter name="http.proxyHost" 
locked="false">localhost</parameter>
         <parameter name="http.proxyPort" locked="false">3128</parameter>
         <parameter name="http.nonProxyHosts" 
locked="false">localhost|moon|sun</parameter-->
     </transportSender>
     <transportSender name="https" 
class="org.apache.synapse.transport.passthru.PassThroughHttpSSLSender">
-        <parameter name="non-blocking" locked="false">true</parameter>
-        <parameter name="warnOnHTTP500" locked="false">*</parameter>
         <parameter name="keystore" locked="false">
             <KeyStore>
                 <Location>lib/identity.jks</Location>


Reply via email to