Code cleanup and remove the extra readInterest = true, they don't see…

…m to be useful. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1853973 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 20, 2019 · 6d3ee3a · 6d3ee3a
1 parent fde6ec2
commit 6d3ee3a
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -473,7 +473,7 @@ protected AtomicInteger initialValue() {
 
         private SendfileData sendfileData = null;
 
-        private final CompletionHandler<Integer, SocketWrapperBase<Nio2Channel>> readCompletionHandler;
+        private final CompletionHandler<Integer, ByteBuffer> readCompletionHandler;
         private final Semaphore readPending = new Semaphore(1);
         private boolean readInterest = false; // Guarded by readCompletionHandler
 
@@ -587,12 +587,12 @@ public Nio2SocketWrapper(Nio2Channel channel, final Nio2Endpoint endpoint) {
             super(channel, endpoint);
             socketBufferHandler = channel.getBufHandler();
 
-            this.readCompletionHandler = new CompletionHandler<Integer, SocketWrapperBase<Nio2Channel>>() {
+            this.readCompletionHandler = new CompletionHandler<Integer, ByteBuffer>() {
                 @Override
-                public void completed(Integer nBytes, SocketWrapperBase<Nio2Channel> attachment) {
+                public void completed(Integer nBytes, ByteBuffer attachment) {
                     boolean notify = false;
                     if (log.isDebugEnabled()) {
-                        log.debug("Socket: [" + attachment + "], Interest: [" + readInterest + "]");
+                        log.debug("Socket: [" + Nio2SocketWrapper.this + "], Interest: [" + readInterest + "]");
                     }
                     synchronized (readCompletionHandler) {
                         if (nBytes.intValue() < 0) {
@@ -609,11 +609,11 @@ public void completed(Integer nBytes, SocketWrapperBase<Nio2Channel> attachment)
                         }
                     }
                     if (notify) {
-                        getEndpoint().processSocket(attachment, SocketEvent.OPEN_READ, false);
+                        getEndpoint().processSocket(Nio2SocketWrapper.this, SocketEvent.OPEN_READ, false);
                     }
                 }
                 @Override
-                public void failed(Throwable exc, SocketWrapperBase<Nio2Channel> attachment) {
+                public void failed(Throwable exc, ByteBuffer attachment) {
                     IOException ioe;
                     if (exc instanceof IOException) {
                         ioe = (IOException) exc;
@@ -628,7 +628,7 @@ public void failed(Throwable exc, SocketWrapperBase<Nio2Channel> attachment) {
                         // If already closed, don't call onError and close again
                         return;
                     }
-                    getEndpoint().processSocket(attachment, SocketEvent.ERROR, true);
+                    getEndpoint().processSocket(Nio2SocketWrapper.this, SocketEvent.ERROR, true);
                 }
             };
 
@@ -810,8 +810,6 @@ public int read(boolean block, byte[] b, int off, int len) throws IOException {
                     socketBufferHandler.configureReadBufferForRead();
                     nRead = Math.min(nRead, len);
                     socketBufferHandler.getReadBuffer().get(b, off, nRead);
-                } else if (nRead == 0 && !block && ContainerThreadMarker.isContainerThread()) {
-                    readInterest = true;
                 }
                 if (log.isDebugEnabled()) {
                     log.debug("Socket: [" + this + "], Read: [" + nRead + "]");
@@ -873,8 +871,6 @@ public int read(boolean block, ByteBuffer to) throws IOException {
                     // data that was just read
                     if (nRead > 0) {
                         nRead = populateReadBuffer(to);
-                    } else if (nRead == 0 && !block && ContainerThreadMarker.isContainerThread()) {
-                        readInterest = true;
                     }
                 }
 
@@ -1226,7 +1222,7 @@ private int fillReadBuffer(boolean block, ByteBuffer to) throws IOException {
                 }
             } else {
                 Nio2Endpoint.startInline();
-                getSocket().read(to, toNio2Timeout(getReadTimeout()), TimeUnit.MILLISECONDS, this,
+                getSocket().read(to, toNio2Timeout(getReadTimeout()), TimeUnit.MILLISECONDS, to,
                         readCompletionHandler);
                 Nio2Endpoint.endInline();
                 if (readPending.availablePermits() == 1) {