svn commit: r1833872 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java NioEndpoint.java

[markt]

Author: markt
Date: Tue Jun 19 19:48:14 2018
New Revision: 1833872

URL: http://svn.apache.org/viewvc?rev=1833872&view=rev
Log:
Revert 1833871 - it was incomplete

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.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=1833872&r1=1833871&r2=1833872&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Jun 19 
19:48:14 2018
@@ -842,7 +842,7 @@ public class Nio2Endpoint extends Abstra
 
         @Override
         public boolean isClosed() {
-            return closed || !getSocket().isOpen();
+            return !getSocket().isOpen();
         }
 
 

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=1833872&r1=1833871&r2=1833872&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jun 19 
19:48:14 2018
@@ -997,7 +997,6 @@ public class NioEndpoint extends Abstrac
         private volatile SendfileData sendfileData = null;
         private volatile long lastRead = System.currentTimeMillis();
         private volatile long lastWrite = lastRead;
-        private volatile boolean closed = false;
 
         public NioSocketWrapper(NioChannel channel, NioEndpoint endpoint) {
             super(channel, endpoint);
@@ -1133,14 +1132,13 @@ public class NioEndpoint extends Abstrac
 
         @Override
         public void close() throws IOException {
-            closed = true;
             getSocket().close();
         }
 
 
         @Override
         public boolean isClosed() {
-            return closed || !getSocket().isOpen();
+            return !getSocket().isOpen();
         }
 
 



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