Author: markt
Date: Thu Oct 10 20:03:00 2013
New Revision: 1531090
URL: http://svn.apache.org/r1531090
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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1531087
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=1531090&r1=1531089&r2=1531090&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 Thu
Oct 10 20:03:00 2013
@@ -1250,18 +1250,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,false);
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
