This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 97fd44c75b Additional Tomcat 11 change
97fd44c75b is described below
commit 97fd44c75bbf39a498ca28dcc7c4855ad96f1949
Author: remm <r...@apache.org>
AuthorDate: Fri Mar 1 09:54:24 2024 +0100
Additional Tomcat 11 change
---
java/org/apache/catalina/Executor.java | 3 ++-
java/org/apache/catalina/core/StandardThreadExecutor.java | 3 +--
java/org/apache/catalina/core/StandardVirtualThreadExecutor.java | 3 +--
webapps/docs/changelog.xml | 4 +++-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/Executor.java
b/java/org/apache/catalina/Executor.java
index bf9b5754f0..4b13f61dd4 100644
--- a/java/org/apache/catalina/Executor.java
+++ b/java/org/apache/catalina/Executor.java
@@ -16,7 +16,8 @@
*/
package org.apache.catalina;
-public interface Executor extends java.util.concurrent.Executor, Lifecycle {
+import java.util.concurrent.ExecutorService;
+public interface Executor extends ExecutorService, Lifecycle {
String getName();
}
\ No newline at end of file
diff --git a/java/org/apache/catalina/core/StandardThreadExecutor.java
b/java/org/apache/catalina/core/StandardThreadExecutor.java
index 162723dcd8..56cb84abc0 100644
--- a/java/org/apache/catalina/core/StandardThreadExecutor.java
+++ b/java/org/apache/catalina/core/StandardThreadExecutor.java
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -36,7 +35,7 @@ import org.apache.tomcat.util.threads.TaskQueue;
import org.apache.tomcat.util.threads.TaskThreadFactory;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
-public class StandardThreadExecutor extends LifecycleMBeanBase implements
Executor, ExecutorService, ResizableExecutor {
+public class StandardThreadExecutor extends LifecycleMBeanBase implements
Executor, ResizableExecutor {
protected static final StringManager sm =
StringManager.getManager(StandardThreadExecutor.class);
diff --git a/java/org/apache/catalina/core/StandardVirtualThreadExecutor.java
b/java/org/apache/catalina/core/StandardVirtualThreadExecutor.java
index 2369ec95a5..b58d34335a 100644
--- a/java/org/apache/catalina/core/StandardVirtualThreadExecutor.java
+++ b/java/org/apache/catalina/core/StandardVirtualThreadExecutor.java
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -36,7 +35,7 @@ import org.apache.tomcat.util.threads.VirtualThreadExecutor;
/**
* An executor that uses a new virtual thread for each task.
*/
-public class StandardVirtualThreadExecutor extends LifecycleMBeanBase
implements Executor, ExecutorService {
+public class StandardVirtualThreadExecutor extends LifecycleMBeanBase
implements Executor {
private static final StringManager sm =
StringManager.getManager(StandardVirtualThreadExecutor.class);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ddde7f947e..a4ba56d379 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,7 +128,9 @@
<fix>
<bug>68692</bug>: The standard thread pool implementations that are
configured using the <code>Executor</code> element now implement
- <code>ExecutorService</code> for better support NIO2. (remm)
+ <code>ExecutorService</code> for better support NIO2. The
+ <code>org.apache.catalina.Executor</code> interface now extends
+ <code>ExecutorService</code>. (remm)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
