You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/08/15 02:10:25 UTC

svn commit: r232680 - in /webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http: CommonsHTTPTransportSender.java server/SimpleHttpServerConnection.java

Author: dims
Date: Sun Aug 14 17:10:23 2005
New Revision: 232680

URL: http://svn.apache.org/viewcvs?rev=232680&view=rev
Log:
back 2 square one on the server-side...but added a timeout on the sender now.


Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServerConnection.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java?rev=232680&r1=232679&r2=232680&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java Sun Aug 14 17:10:23 2005
@@ -347,6 +347,11 @@
         httpClient = new HttpClient();
         //hostConfig handles the socket functions..
         HostConfiguration hostConfig = getHostConfiguration(msgContext, url);
+
+        // SO_TIMEOUT -- timeout for blocking reads
+        httpClient.getHttpConnectionManager().getParams().setSoTimeout(60000);
+        // timeout for initial connection
+        httpClient.getHttpConnectionManager().getParams().setConnectionTimeout(60000);
 
         PostMethod postMethod = new PostMethod();
         postMethod.setPath(url.getFile());

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServerConnection.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServerConnection.java?rev=232680&r1=232679&r2=232680&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServerConnection.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis2/transport/http/server/SimpleHttpServerConnection.java Sun Aug 14 17:10:23 2005
@@ -64,10 +64,6 @@
             throw new IllegalArgumentException("Socket may not be null");
         }
         this.socket = socket;
-        this.socket.setSoLinger(true, 2);
-        this.socket.setKeepAlive(true);
-        this.socket.setSoTimeout(60000);
-        this.socket.setTcpNoDelay(true);
         this.in = socket.getInputStream();
         this.out = socket.getOutputStream();
     }
@@ -77,7 +73,6 @@
             if (socket != null) {
                 in.close();
                 out.close();
-                socket.shutdownOutput();
                 socket.close();
                 socket = null;
             }