svn commit: r1212258 - in /synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp: HttpCoreNIOSender.java ListenerContext.java NhttpConstants.java

[charith]

Author: charith
Date: Fri Dec  9 06:21:15 2011
New Revision: 1212258

URL: http://svn.apache.org/viewvc?rev=1212258&view=rev
Log:
Fix forSYNAPSE-824

Modified:
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java?rev=1212258&r1=1212257&r2=1212258&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
 Fri Dec  9 06:21:15 2011
@@ -263,7 +263,7 @@ public class HttpCoreNIOSender extends A
         HttpParams params = new BasicHttpParams();
         params
             .setIntParameter(HttpConnectionParams.SO_TIMEOUT,
-                cfg.getProperty(HttpConnectionParams.SO_TIMEOUT, 60000))
+                cfg.getProperty(NhttpConstants.SO_TIMEOUT_SENDER, 60000))
             .setIntParameter(HttpConnectionParams.CONNECTION_TIMEOUT,
                 cfg.getProperty(HttpConnectionParams.CONNECTION_TIMEOUT, 
10000))
             .setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE,

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java?rev=1212258&r1=1212257&r2=1212258&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
 Fri Dec  9 06:21:15 2011
@@ -249,7 +249,7 @@ public class ListenerContext {
         NHttpConfiguration cfg = NHttpConfiguration.getInstance();
         params
             .setIntParameter(HttpConnectionParams.SO_TIMEOUT,
-                cfg.getProperty(HttpConnectionParams.SO_TIMEOUT, 60000))
+                cfg.getProperty(NhttpConstants.SO_TIMEOUT_RECEIVER, 60000))
             .setIntParameter(HttpConnectionParams.SOCKET_BUFFER_SIZE,
                 cfg.getProperty(HttpConnectionParams.SOCKET_BUFFER_SIZE, 8 * 
1024))
             .setBooleanParameter(HttpConnectionParams.STALE_CONNECTION_CHECK,

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java?rev=1212258&r1=1212257&r2=1212258&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/NhttpConstants.java
 Fri Dec  9 06:21:15 2011
@@ -146,4 +146,11 @@ public class NhttpConstants {
     public static final String ENDPOINTS_CONFIGURATION = 
"endpointsConfiguration";
 
     public static final String HEADER_X_FORWARDED_FOR = "X-Forwarded-For";
+
+    /**
+     * nhttp property that must be defined in nhttp.properties to set receiver 
timeout
+     * and sender timeout.
+     */
+    public static final String SO_TIMEOUT_RECEIVER = 
"http.socket.timeout.receiver";
+    public static final String SO_TIMEOUT_SENDER = 
"http.socket.timeout.sender";
 }