tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1746584 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Date Thu, 02 Jun 2016 14:52:37 GMT
Author: markt
Date: Thu Jun  2 14:52:36 2016
New Revision: 1746584

URL: http://svn.apache.org/viewvc?rev=1746584&view=rev
Log:
Fix loop observed during local testing

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1746584&r1=1746583&r2=1746584&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Thu Jun  2 14:52:36 2016
@@ -718,7 +718,8 @@ public abstract class AbstractProtocol<S
             S socket = wrapper.getSocket();
 
             Processor processor = connections.get(socket);
-            if (status == SocketEvent.DISCONNECT && processor == null) {
+            if ((status == SocketEvent.DISCONNECT || status == SocketEvent.ERROR)
+                    && processor == null) {
                 // Nothing to do. Endpoint requested a close and there is no
                 // longer a processor associated with this socket.
                 return SocketState.CLOSED;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message