luehe 2003/11/06 10:23:20
Modified: util/java/org/apache/tomcat/util/threads ThreadPool.java
Log:
Moved the adjustment of maxThreads settings <10 from setMaxThreads()
to adjustLimits()
Revision Changes Path
1.17 +6 -8
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java
Index: ThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/ThreadPool.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ThreadPool.java 3 Nov 2003 21:54:24 -0000 1.16
+++ ThreadPool.java 6 Nov 2003 18:23:20 -0000 1.17
@@ -201,14 +201,7 @@
}
public void setMaxThreads(int maxThreads) {
- if (maxThreads < MAX_THREADS_MIN) {
- log.warn(sm.getString("threadpool.max_threads_too_low",
- new Integer(maxThreads),
- new Integer(MAX_THREADS_MIN)));
- this.maxThreads = MAX_THREADS_MIN;
- } else {
- this.maxThreads = maxThreads;
- }
+ this.maxThreads = maxThreads;
}
public int getMaxThreads() {
@@ -477,6 +470,11 @@
protected void adjustLimits() {
if(maxThreads <= 0) {
maxThreads = MAX_THREADS;
+ } else if (maxThreads < MAX_THREADS_MIN) {
+ log.warn(sm.getString("threadpool.max_threads_too_low",
+ new Integer(maxThreads),
+ new Integer(MAX_THREADS_MIN)));
+ maxThreads = MAX_THREADS_MIN;
}
if(maxSpareThreads >= maxThreads) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
