Author: remm
Date: Fri Apr 27 16:09:50 2018
New Revision: 1830364
URL: http://svn.apache.org/viewvc?rev=1830364&view=rev
Log:
Don't call the handler twice on timeout failure (the IO operation will already
do it).
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1830364&r1=1830363&r2=1830364&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Apr 27
16:09:50 2018
@@ -1086,7 +1086,6 @@ public class Nio2Endpoint extends Abstra
try {
state.wait(unit.toMillis(timeout));
if (state.state == CompletionState.PENDING) {
- handler.failed(new SocketTimeoutException(),
attachment);
return CompletionState.ERROR;
}
} catch (InterruptedException e) {
@@ -1154,7 +1153,6 @@ public class Nio2Endpoint extends Abstra
try {
state.wait(unit.toMillis(timeout));
if (state.state == CompletionState.PENDING) {
- handler.failed(new SocketTimeoutException(),
attachment);
return CompletionState.ERROR;
}
} catch (InterruptedException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
