Revert 1833871 - it was incomplete

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1833872 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 19, 2018 · 332877b · 332877b
1 parent f34a8b1
commit 332877b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -842,7 +842,7 @@ public void close() throws IOException {
 
         @Override
         public boolean isClosed() {
-            return closed || !getSocket().isOpen();
+            return !getSocket().isOpen();
         }
 
 

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -997,7 +997,6 @@ public static class NioSocketWrapper extends SocketWrapperBase<NioChannel> {
         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 int read(boolean block, ByteBuffer to) throws IOException {
 
         @Override
         public void close() throws IOException {
-            closed = true;
             getSocket().close();
         }
 
 
         @Override
         public boolean isClosed() {
-            return closed || !getSocket().isOpen();
+            return !getSocket().isOpen();
         }