incubator-droids-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfrov...@apache.org
Subject svn commit: r1204107 - /incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
Date Sun, 20 Nov 2011 00:47:29 GMT
Author: rfrovarp
Date: Sun Nov 20 00:47:29 2011
New Revision: 1204107

URL: http://svn.apache.org/viewvc?rev=1204107&view=rev
Log:
Merge fix for DROIDS-154 over from 0.1.x branch to trunk

Modified:
    incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
  (contents, props changed)

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=1204107&r1=1204106&r2=1204107&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
Sun Nov 20 00:47:29 2011
@@ -335,7 +335,9 @@ public class MultiThreadedTaskMaster<T e
           }
 
           // execute the task
-          worker.execute(task);
+          if(!task.isAborted()) {
+            worker.execute(task);
+          }
 
           // debug
           if (log.isDebugEnabled()) {

Propchange: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 20 00:47:29 2011
@@ -0,0 +1 @@
+/incubator/droids/branches/0.1.x/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java:1127755-1204106



Mime
View raw message