You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/07/11 23:22:30 UTC

cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/pool ThreadPool.java ExecutorFactory.java

djencks     2004/07/11 14:22:30

  Modified:    modules/core/src/java/org/apache/geronimo/pool
                        ThreadPool.java
  Removed:     modules/core/src/java/org/apache/geronimo/pool
                        ExecutorFactory.java
  Log:
  remove ExecutorFactory per Dain's suggestion
  
  Revision  Changes    Path
  1.5       +2 -21     incubator-geronimo/modules/core/src/java/org/apache/geronimo/pool/ThreadPool.java
  
  Index: ThreadPool.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/pool/ThreadPool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ThreadPool.java	11 Jul 2004 02:15:23 -0000	1.4
  +++ ThreadPool.java	11 Jul 2004 21:22:30 -0000	1.5
  @@ -32,22 +32,17 @@
   /**
    * @version $Revision$ $Date$
    */
  -public class ThreadPool implements Executor, ExecutorFactory, GBeanLifecycle {
  +public class ThreadPool implements Executor, GBeanLifecycle {
   
       static private final Log log = LogFactory.getLog(ThreadPool.class);
   
       private PooledExecutor executor;
       private long keepAliveTime;
       private int poolSize;
  -    private int maximumPoolSize;
       private String poolName;
   
       private int nextWorkerID = 0;
   
  -    public Executor getExecutor() {
  -        return new ExecutorWrapper(executor);
  -    }
  -
       public long getKeepAliveTime() {
           return keepAliveTime;
       }
  @@ -108,18 +103,6 @@
           }
       }
   
  -    private static class ExecutorWrapper implements Executor {
  -        private final Executor delegate;
  -
  -        public ExecutorWrapper(Executor delegate) {
  -            this.delegate = delegate;
  -        }
  -
  -        public void execute(Runnable command) throws InterruptedException {
  -            delegate.execute(command);
  -        }
  -    }
  -
       private static final GBeanInfo GBEAN_INFO;
   
       static {
  @@ -128,10 +111,8 @@
           infoFactory.addAttribute("keepAliveTime", long.class, true);
           infoFactory.addAttribute("poolSize", int.class, true);
           infoFactory.addAttribute("poolName", String.class, true);
  -        infoFactory.addOperation("getExecutor");
   
           infoFactory.addInterface(Executor.class);
  -        infoFactory.addInterface(ExecutorFactory.class);
   
           GBEAN_INFO = infoFactory.getBeanInfo();
       }