You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ad...@apache.org on 2004/03/10 02:06:05 UTC

cvs commit: incubator-geronimo/modules/system/src/java/org/apache/geronimo/system ThreadPool.java

adc         2004/03/09 17:06:05

  Modified:    modules/system/src/java/org/apache/geronimo/system
                        ThreadPool.java
  Log:
  Draining doesn't seem to work.
  
  Revision  Changes    Path
  1.3       +2 -13     incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ThreadPool.java
  
  Index: ThreadPool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ThreadPool.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ThreadPool.java	25 Feb 2004 09:58:14 -0000	1.2
  +++ ThreadPool.java	10 Mar 2004 01:06:05 -0000	1.3
  @@ -41,19 +41,10 @@
       private long keepAliveTime;
       private int minimumPoolSize;
       private int maximumPoolSize;
  -    private long maxDrainTime;
       private String poolName;
   
       private int nextWorkerID = 0;
   
  -    public long getMaxDrainTime() {
  -        return maxDrainTime;
  -    }
  -
  -    public void setMaxDrainTime(long maxDrainTime) {
  -        this.maxDrainTime = maxDrainTime;
  -    }
  -
       public Executor getWorkManager() {
           return workManager;
       }
  @@ -114,8 +105,7 @@
       }
   
       public void doStop() throws WaitingException, Exception {
  -        workManager.shutdownAfterProcessingCurrentlyQueuedTasks();
  -        workManager.awaitTerminationAfterShutdown(maxDrainTime);
  +        workManager.shutdownNow();
           log.info("Thread pool " + poolName + " stopped");
       }
   
  @@ -127,7 +117,6 @@
       static {
           GBeanInfoFactory infoFactory = new GBeanInfoFactory(ThreadPool.class.getName());
   
  -        infoFactory.addAttribute("maxDrainTime", true);
           infoFactory.addAttribute("keepAliveTime", true);
           infoFactory.addAttribute("minimumPoolSize", true);
           infoFactory.addAttribute("maximumPoolSize", true);