remm 2003/09/23 00:09:55
Modified: util/java/org/apache/tomcat/util/net Tag: coyote_10
PoolTcpEndpoint.java
Log:
- Port patch.
- Don't catch SocketException when setting the socket options, so that when
it happens the socket is discarded right away. The exception will also be
properly logged.
Revision Changes Path
No revision
No revision
1.12.2.3 +10 -14
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- PoolTcpEndpoint.java 13 Sep 2003 04:01:24 -0000 1.12.2.2
+++ PoolTcpEndpoint.java 23 Sep 2003 07:09:54 -0000 1.12.2.3
@@ -460,17 +460,13 @@
}
void setSocketOptions(Socket socket)
- {
- try {
- if(linger >= 0 )
- socket.setSoLinger( true, linger);
- if( tcpNoDelay )
- socket.setTcpNoDelay(tcpNoDelay);
- if( socketTimeout > 0 )
- socket.setSoTimeout( socketTimeout );
- } catch( SocketException se ) {
- se.printStackTrace();
- }
+ throws SocketException {
+ if(linger >= 0 )
+ socket.setSoLinger( true, linger);
+ if( tcpNoDelay )
+ socket.setTcpNoDelay(tcpNoDelay);
+ if( socketTimeout > 0 )
+ socket.setSoTimeout( socketTimeout );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
