Author: markt
Date: Thu Sep 17 09:01:20 2015
New Revision: 1703536
URL: http://svn.apache.org/r1703536
Log: (empty)
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1703536&r1=1703535&r2=1703536&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Sep 17 09:01:20 2015
@@ -1286,8 +1286,6 @@ public class NioEndpoint extends Abstrac
KeyAttachment ka = (KeyAttachment) key.attachment();
if ( ka == null ) {
cancelledKey(key, SocketStatus.ERROR); //we don't
support any keys without attachments
- } else if ( ka.getError() ) {
- cancelledKey(key, SocketStatus.ERROR);//TODO this
is not yet being used
} else if (ka.getCometNotify() ) {
ka.setCometNotify(false);
int ops = ka.interestOps() & ~OP_CALLBACK;
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1703536&r1=1703535&r2=1703536&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Thu
Sep 17 09:01:20 2015
@@ -32,7 +32,7 @@ public class SocketWrapper<E> {
private volatile long lastAccess = System.currentTimeMillis();
private volatile long timeout = -1;
- private boolean error = false;
+ private volatile boolean error = false;
private volatile int keepAliveLeft = 100;
private volatile boolean comet = false;
private volatile boolean async = false;
@@ -100,6 +100,7 @@ public class SocketWrapper<E> {
public void access(long access) { lastAccess = access; }
public void setTimeout(long timeout) {this.timeout = timeout;}
public long getTimeout() {return this.timeout;}
+ // error is used by NIO2 - will move to Nio2SocketWraper in Tomcat 9
public boolean getError() { return error; }
public void setError(boolean error) { this.error = error; }
public void setKeepAliveLeft(int keepAliveLeft) { this.keepAliveLeft =
keepAliveLeft;}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1703536&r1=1703535&r2=1703536&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Sep 17 09:01:20 2015
@@ -164,6 +164,10 @@
<bug>58389</bug>: Fix a rare data race while shutting down the thread
pools on Connector stop. (markt)
</fix>
+ <scode>
+ Clean up use of error flag on socket wrapper prompted by
+ <bug>58390</bug>. (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
