Author: markt
Date: Thu Oct 10 19:59:30 2013
New Revision: 1531087
URL: http://svn.apache.org/r1531087
Log:
Fix a bug introduced in r1357039 that removed a local close variable which mean
that code that should of triggered a socket close, ended up closing the Poller
as well.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1531087&r1=1531086&r2=1531087&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Oct 10
19:59:30 2013
@@ -1158,18 +1158,19 @@ public class NioEndpoint extends Abstrac
} else {
if ( isWorkerAvailable() ) {
unreg(sk, attachment, sk.readyOps());
+ boolean closeSocket = false;
// Read goes before write
if (sk.isReadable()) {
if (!processSocket(channel,
SocketStatus.OPEN_READ, true)) {
- close = true;
+ closeSocket = true;
}
}
- if (!close && sk.isWritable()) {
+ if (!closeSocket && sk.isWritable()) {
if (!processSocket(channel,
SocketStatus.OPEN_WRITE, true)) {
- close = true;
+ closeSocket = true;
}
}
- if (close) {
+ if (closeSocket) {
cancelledKey(sk,SocketStatus.DISCONNECT);
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
