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 na...@apache.org on 2006/03/17 22:04:26 UTC

svn commit: r386713 - in /webservices/axis/trunk/c/tests/utils/monitor/org/apache/test: MockServer.java TCPMonitor.java TestClientListener.java

Author: nadiramra
Date: Fri Mar 17 13:04:24 2006
New Revision: 386713

URL: http://svn.apache.org/viewcvs?rev=386713&view=rev
Log:
Set keep-alive and do not use reuseaddress option on client sockets.

Modified:
    webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServer.java
    webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TCPMonitor.java
    webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TestClientListener.java

Modified: webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServer.java?rev=386713&r1=386712&r2=386713&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServer.java (original)
+++ webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/MockServer.java Fri Mar 17 13:04:24 2006
@@ -145,6 +145,11 @@
                 System.out
                         .println("Mockserver#run(): About to wait for incoming client request");
                 incoming=serverSocket.accept( );
+
+                // Set keep-alive option to ensure that if server crashes we do not 
+                // hang waiting on TCP/IP response.
+                incoming.setKeepAlive(true);
+                
                 System.out.println("Mockserver#run(): Got a new client request");
             }
             catch (SocketTimeoutException socketTimeoutException)

Modified: webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TCPMonitor.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TCPMonitor.java?rev=386713&r1=386712&r2=386713&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TCPMonitor.java (original)
+++ webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TCPMonitor.java Fri Mar 17 13:04:24 2006
@@ -256,8 +256,15 @@
     {
 		Socket socket = new Socket();
 		InetSocketAddress remoteAddress = new InetSocketAddress(hostname, port);
-		socket.setKeepAlive(false);
-		socket.setReuseAddress(true);
+        
+        // Set keep-alive option to ensure that if server crashes we do not 
+        // hang waiting on TCP/IP response.
+		socket.setKeepAlive(true);
+        
+        // No reason to set reuse-address since client sockets are not binding to 
+        // some explicit address.  Also, setting this to true causes problems on OS/400.
+		// socket.setReuseAddress(true);
+                
 		socket.connect(remoteAddress);
 		
 		return socket;

Modified: webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TestClientListener.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TestClientListener.java?rev=386713&r1=386712&r2=386713&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TestClientListener.java (original)
+++ webservices/axis/trunk/c/tests/utils/monitor/org/apache/test/TestClientListener.java Fri Mar 17 13:04:24 2006
@@ -80,6 +80,11 @@
                 System.out
                         .println("TestClientListener#run(): Waiting for a new client request");
                 clientSocket=serverSocket.accept( );
+                
+                // Set keep-alive option to ensure that if client crashes we do not 
+                // hang waiting on TCP/IP response.
+                clientSocket.setKeepAlive(true);
+                
                 System.out
                         .println("TestClientListener#run():Got a client new client request");
             }