You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/12/14 16:00:34 UTC
svn commit: r1719928 -
/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Mon Dec 14 15:00:34 2015
New Revision: 1719928
URL: http://svn.apache.org/viewvc?rev=1719928&view=rev
Log:
Simplify
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=1719928&r1=1719927&r2=1719928&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Dec 14 15:00:34 2015
@@ -1635,10 +1635,9 @@ public class Nio2Endpoint extends Abstra
// For STOP there is no point trying to handshake as the
// Poller has been stopped.
if (socket.getSocket().isHandshakeComplete() ||
- status == SocketEvent.STOP) {
+ status == SocketEvent.STOP ||
+ status == SocketEvent.ERROR) {
handshake = 0;
- } else if (status == SocketEvent.ERROR) {
- handshake = -1;
} else {
handshake = socket.getSocket().handshake();
// The handshake process reads/writes from/to the
@@ -1657,7 +1656,7 @@ public class Nio2Endpoint extends Abstra
log.debug(sm.getString("endpoint.err.handshake"), x);
}
}
- if (handshake == 0 || status == SocketEvent.ERROR) {
+ if (handshake == 0) {
SocketState state = SocketState.OPEN;
// Process the request from this socket
if (status == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org