cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads ThreadPool.java

[remm]

remm        2004/01/21 09:54:02

  Modified:    util/java/org/apache/tomcat/util/threads ThreadPool.java
  Log:
  - Don't create a monitor thread unless maxSpareThreads < maxThreads.
  
  Revision  Changes    Path
  1.21      +7 -3      
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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ThreadPool.java   8 Jan 2004 13:56:36 -0000       1.20
  +++ ThreadPool.java   21 Jan 2004 17:54:02 -0000      1.21
  @@ -193,7 +193,9 @@
           pool = new ControlRunnable[maxThreads];
   
           openThreads(minSpareThreads);
  -        monitor = new MonitorRunnable(this);
  +        if (maxSpareThreads < maxThreads) {
  +            monitor = new MonitorRunnable(this);
  +        }
       }
   
       public MonitorRunnable getMonitor() {
  @@ -387,8 +389,10 @@
       public synchronized void shutdown() {
           if(!stopThePool) {
               stopThePool = true;
  -            monitor.terminate();
  -            monitor = null;
  +            if (monitor != null) {
  +                monitor.terminate();
  +                monitor = null;
  +            }
               for(int i = 0 ; i < (currentThreadCount - currentThreadsBusy - 1) ; 
i++) {
                   try {
                       pool[i].terminate();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]