svn commit: r708782 - in /synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp: Axis2HttpRequest.java NHttpConfiguration.java NhttpConstants.java

[asankha]

Author: asankha
Date: Tue Oct 28 22:32:58 2008
New Revision: 708782

URL: http://svn.apache.org/viewvc?rev=708782&view=rev
Log:
fix SYNAPSE-476

Modified:
    
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
    
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NHttpConfiguration.java
    
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java

Modified: 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java?rev=708782&r1=708781&r2=708782&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
 Tue Oct 28 22:32:58 2008
@@ -229,6 +229,11 @@
             HTTP.CONTENT_TYPE,
             messageFormatter.getContentType(msgContext, format, 
msgContext.getSoapAction()));
 
+        if (NHttpConfiguration.getInstance().isKeepAliveDisabled() ||
+            msgContext.isPropertyTrue(NhttpConstants.NO_KEEPALIVE)) {
+            httpRequest.setHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE);
+        }
+
         return httpRequest;
     }
 

Modified: 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NHttpConfiguration.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NHttpConfiguration.java?rev=708782&r1=708781&r2=708782&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NHttpConfiguration.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NHttpConfiguration.java
 Tue Oct 28 22:32:58 2008
@@ -116,6 +116,10 @@
         return getProperty(G_BUFFER_SIZE, BUFFER_SIZE);
     }
 
+    public boolean isKeepAliveDisabled() {
+        return getProperty(NhttpConstants.DISABLE_KEEPALIVE, 0) == 1;
+    }
+
     /**
      * Get properties that tune nhttp transport. Preference to system 
properties
      * @param name name of the system/config property

Modified: 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java?rev=708782&r1=708781&r2=708782&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
 (original)
+++ 
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
 Tue Oct 28 22:32:58 2008
@@ -24,6 +24,8 @@
     public static final String HTTP_SC = "HTTP_SC";
     public static final String FORCE_HTTP_1_0 = "FORCE_HTTP_1.0";
     public static final String POST_TO_PATH = "POST_TO_PATH";
+    public static final String NO_KEEPALIVE = "NO_KEEPALIVE";
+    public static final String DISABLE_KEEPALIVE = 
"http.connection.disable.keepalive";
     public static final String IGNORE_SC_ACCEPTED = "IGNORE_SC_ACCEPTED";
     public static final String FORCE_SC_ACCEPTED = "FORCE_SC_ACCEPTED";