You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2015/10/25 18:50:03 UTC
svn commit: r1710467 -
/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: kkolinko
Date: Sun Oct 25 17:50:03 2015
New Revision: 1710467
URL: http://svn.apache.org/viewvc?rev=1710467&view=rev
Log:
Simplify. Followup to r1688909.
The private close() method called here already has try/catch(Exception) around all the code.
This change was part of original r1688904 in Tomcat 8, but was missed during backport.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1710467&r1=1710466&r2=1710467&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Oct 25 17:50:03 2015
@@ -1758,11 +1758,7 @@ public class NioEndpoint extends Abstrac
}
if (state == SocketState.CLOSED) {
// Close socket and pool
- try {
- close(ka, socket, key, SocketStatus.ERROR);
- } catch ( Exception x ) {
- log.error("",x);
- }
+ close(ka, socket, key, SocketStatus.ERROR);
}
} else if (handshake == -1 ) {
close(ka, socket, key, SocketStatus.DISCONNECT);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org