You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/07/28 20:21:40 UTC
[tomcat] branch 8.5.x updated: Remove Java 5 references
This is an automated email from the ASF dual-hosted git repository.
markt 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 6bc42c1 Remove Java 5 references
6bc42c1 is described below
commit 6bc42c17b1920f428fbf71af7e7eb35da526fd37
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 95907b4..d141106 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 34e05ec..413a8ad 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -72,8 +72,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 8500845..4fd9137 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -62,8 +62,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org