Author: markt
Date: Tue Sep 15 21:06:14 2009
New Revision: 815486
URL: http://svn.apache.org/viewvc?rev=815486&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47161
Correctly report maxThreads
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=815486&r1=815485&r2=815486&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Tue Sep
15 21:06:14 2009
@@ -209,7 +209,19 @@
}
}
}
- public int getMaxThreads() { return maxThreads; }
+ public int getMaxThreads() {
+ if (running && executor!=null) {
+ if (executor instanceof java.util.concurrent.ThreadPoolExecutor) {
+ return
((java.util.concurrent.ThreadPoolExecutor)executor).getMaximumPoolSize();
+ } else if (executor instanceof ResizableExecutor) {
+ return ((ResizableExecutor)executor).getMaxThreads();
+ } else {
+ return -1;
+ }
+ } else {
+ return maxThreads;
+ }
+ }
/**
* Max keep alive requests
Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java?rev=815486&r1=815485&r2=815486&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/ResizableExecutor.java Tue
Sep 15 21:06:14 2009
@@ -25,6 +25,8 @@
*/
public int getPoolSize();
+ public int getMaxThreads();
+
/**
* {...@link java.util.concurrent.ThreadPoolExecutor#getActiveCount()}
* @return {...@link
java.util.concurrent.ThreadPoolExecutor#getActiveCount()}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
