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 2022/02/16 20:39:01 UTC

[tomcat] branch 9.0.x updated: Align with 8.5.x

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 2d82048  Align with 8.5.x
2d82048 is described below

commit 2d82048126b4bb0a651f1618bbe18655825f11bb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 16 20:25:07 2022 +0000

    Align with 8.5.x
---
 .../apache/tomcat/util/net/AbstractEndpoint.java   | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 98f07e7..6ff8ada 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -464,29 +464,39 @@ public abstract class AbstractEndpoint<S,U> {
 
 
     /**
-     * Acceptor thread count.
+     * Unused.
+     *
+     * @deprecated  This attribute is hard-coded to {@code 1} and is no longer
+     *              configurable. It will be removed in Tomcat 10.1.
      */
+    @Deprecated
     protected int acceptorThreadCount = 1;
 
     /**
-     * NO-OP.
+     * Unused.
      *
-     * @param acceptorThreadCount Unused
+     * @param acceptorThreadCount   Ignored
      *
-     * @deprecated Will be removed in Tomcat 10.
+     * @deprecated  This attribute is hard-coded to {@code 1} and is no longer
+     *              configurable. This setter will be removed in Tomcat 10.
      */
     @Deprecated
-    public void setAcceptorThreadCount(int acceptorThreadCount) {}
+    public void setAcceptorThreadCount(int acceptorThreadCount) {
+        // NO-OP;
+    }
 
     /**
-     * Always returns 1.
+     * Unused.
      *
-     * @return Always 1.
+     * @return  Always returns {@code 1}
      *
-     * @deprecated Will be removed in Tomcat 10.
+     * @deprecated  This attribute is hard-coded to {@code 1} and is no longer
+     *              configurable. This getter will be removed in Tomcat 10.
      */
     @Deprecated
-    public int getAcceptorThreadCount() { return 1; }
+    public int getAcceptorThreadCount() {
+        return 1;
+    }
 
 
     /**

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org