This is an automated email from the ASF dual-hosted git repository. lihan pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new ffb68373ae Revert "Clear SocketWrapper reference to help GC" ffb68373ae is described below commit ffb68373ae76a0c4f62e65800b544feba09fdba5 Author: lihan <li...@apache.org> AuthorDate: Sun May 21 09:30:02 2023 +0800 Revert "Clear SocketWrapper reference to help GC" This reverts commit 2a084c266e09b048c1a49c749cb8ab1e8feedbfc. --- java/org/apache/coyote/AbstractProcessor.java | 3 --- java/org/apache/coyote/http11/Http11Processor.java | 1 + java/org/apache/tomcat/util/net/Nio2Channel.java | 1 - java/org/apache/tomcat/util/net/NioChannel.java | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/java/org/apache/coyote/AbstractProcessor.java b/java/org/apache/coyote/AbstractProcessor.java index 0295396112..2a28d683ed 100644 --- a/java/org/apache/coyote/AbstractProcessor.java +++ b/java/org/apache/coyote/AbstractProcessor.java @@ -709,9 +709,6 @@ public abstract class AbstractProcessor extends AbstractProcessorLight implement public void recycle() { errorState = ErrorState.NONE; asyncStateMachine.recycle(); - // Clear fields that can be cleared to aid GC and trigger NPEs if this - // is reused - socketWrapper = null; } diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index 5cc2ecc752..b8705441e8 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -1612,6 +1612,7 @@ public class Http11Processor extends AbstractProcessor { inputBuffer.recycle(); outputBuffer.recycle(); upgradeToken = null; + socketWrapper = null; sendfileData = null; } diff --git a/java/org/apache/tomcat/util/net/Nio2Channel.java b/java/org/apache/tomcat/util/net/Nio2Channel.java index 6040b8855e..a2612fd0c1 100644 --- a/java/org/apache/tomcat/util/net/Nio2Channel.java +++ b/java/org/apache/tomcat/util/net/Nio2Channel.java @@ -79,7 +79,6 @@ public class Nio2Channel implements AsynchronousByteChannel { @Override public void close() throws IOException { sc.close(); - reset(this.sc, null); } diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java index 777880d67d..8e3cb4f0e1 100644 --- a/java/org/apache/tomcat/util/net/NioChannel.java +++ b/java/org/apache/tomcat/util/net/NioChannel.java @@ -99,7 +99,6 @@ public class NioChannel implements ByteChannel, ScatteringByteChannel, Gathering @Override public void close() throws IOException { sc.close(); - reset(this.sc,null); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org