This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 027605b Remove Java 5 references 027605b is described below commit 027605b3c991a0ed24344329a00f597b003d412d Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Jul 28 21:20:16 2021 +0100 Remove Java 5 references --- java/org/apache/catalina/ha/tcp/ReplicationValve.java | 6 ++---- java/org/apache/tomcat/util/net/AprEndpoint.java | 3 +-- java/org/apache/tomcat/util/net/NioEndpoint.java | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java index 1644c61..4af6bf6 100644 --- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java +++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java @@ -345,13 +345,11 @@ public class ReplicationValve } finally { // Array must be remove: Current master request send endAccess at recycle. // Don't register this request session again! - if(isCrossContext) { + if (isCrossContext) { if(log.isDebugEnabled()) { log.debug(sm.getString("ReplicationValve.crossContext.remove")); } - // crossContextSessions.remove() only exist at Java 5 - // register ArrayList at a pool - crossContextSessions.set(null); + crossContextSessions.remove(); } } } diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index d845630..3c2f68a 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -77,8 +77,7 @@ import org.apache.tomcat.util.net.openssl.OpenSSLUtil; * <li>Worker threads pool</li> * </ul> * - * When switching to Java 5, there's an opportunity to use the virtual - * machine's thread pool. + * TODO: Consider using the virtual machine's thread pool. * * @author Mladen Turk * @author Remy Maucherat diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 0f73308..7fedf39 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -70,8 +70,7 @@ import org.apache.tomcat.util.net.jsse.JSSESupport; * <li>Worker threads pool</li> * </ul> * - * When switching to Java 5, there's an opportunity to use the virtual - * machine's thread pool. + * TODO: Consider using the virtual machine's thread pool. * * @author Mladen Turk * @author Remy Maucherat --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org