svn commit: r734928 - in /incubator/droids/trunk/droids-core/src/main/java/org/apache/droids: api/TaskMaster.java impl/MultiThreadedTaskMaster.java

[ryan]

Author: ryan
Date: Thu Jan 15 22:51:12 2009
New Revision: 734928

URL: http://svn.apache.org/viewvc?rev=734928&view=rev
Log:
rename internal worker to runner -- avoid confusion with the worker interface

Modified:
    
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/TaskMaster.java
    
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java

Modified: 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/TaskMaster.java
URL: 
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/TaskMaster.java?rev=734928&r1=734927&r2=734928&view=diff
==============================================================================
--- 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/TaskMaster.java
 (original)
+++ 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/TaskMaster.java
 Thu Jan 15 22:51:12 2009
@@ -16,9 +16,7 @@
  */
 package org.apache.droids.api;
 
-import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 
@@ -31,7 +29,6 @@
     INITALIZED,
     RUNNING,
     PAUSED,
-    WAITING,  // Waiting via DelayTimer
     COMPLETE
   };
  

Modified: 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
URL: 
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java?rev=734928&r1=734927&r2=734928&view=diff
==============================================================================
--- 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
 (original)
+++ 
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
 Thu Jan 15 22:51:12 2009
@@ -77,18 +77,18 @@
   }
   
   
-  private void finishedWorker(WorkerRunner worker) 
+  private void finishedRunner(WorkerRunner runner) 
   { 
     synchronized (this) {
-      lastCompletedTask = worker.task;
-      pool.remove(worker);
+      lastCompletedTask = runner.task;
+      pool.remove(runner);
       if (log.isDebugEnabled()) {
-        log.debug("Worker '" + worker.task.getId() + "' has finished.");
+        log.debug("Worker '" + runner.task.getId() + "' has finished.");
       }
 
       boolean terminate = false;
       
-      Exception ex = worker.getException();
+      Exception ex = runner.exception;
       if (ex != null) {
         TaskExceptionResult result = TaskExceptionResult.WARN;  
         if (exHandler != null) {
@@ -166,7 +166,7 @@
   public void setDelayTimer(DelayTimer delayTimer) {
     this.delayTimer = delayTimer;
   }
-
+  
   /**
    * Adjust number of allowed threads
    * @param maxThreads
@@ -226,17 +226,11 @@
    * Wrapper to call finishedWorker() after 
    */
   class WorkerRunner implements Runnable {
-    
-    Date startTime;
     T task;
-    Worker<T> worker;
     Exception exception;
-    ExecutionState state;
     
     @Override
     public void run() {
-      startTime = new Date();
-      state = ExecutionState.RUNNING;
       try {
         task = queue.next();
         if( task != null ) {
@@ -244,32 +238,25 @@
             long delay = delayTimer.getDelayMillis();
             if( delay > 0 ) {
               try {
-                state = ExecutionState.WAITING;
                 Thread.sleep( delay );
               } 
               catch (InterruptedException e) {} // we don't really care....
             }
-            state = ExecutionState.RUNNING;
           }
 
-          worker = droid.getNewWorker();
+          Worker<T> worker = droid.getNewWorker();
           try {
             worker.execute( task );
-          } 
+          }
           catch (Exception ex) {
             exception = ex;
           }
         }
       }
       finally {
-        state = ExecutionState.COMPLETE;
-        finishedWorker( this );
+        finishedRunner( this );
       }
     }
-    
-    public Exception getException() {
-      return exception;
-    }
   }
 
   public long getCompletedTasks() {
@@ -341,7 +328,6 @@
       pool.pauseLock.unlock();
     }
   }
-
 }