Author: thorsten
Date: Fri Apr 30 10:15:30 2010
New Revision: 939616
URL: http://svn.apache.org/viewvc?rev=939616&view=rev
Log:
DROIDS-76
Inconsistent awaitTermination between SequentialTaskMaster and
MultiThreadedTaskMaster
Reporter Richard Frovarp
Patch: Javier Puerto
Review: R. Frovarp
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java?rev=939616&r1=939615&r2=939616&view=diff
==============================================================================
---
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
(original)
+++
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SequentialTaskMaster.java
Fri Apr 30 10:15:30 2010
@@ -149,7 +149,7 @@ public class SequentialTaskMaster<T exte
long remaining = timeout;
while (!completed) {
this.mutex.wait(remaining);
- if (timeout > 0) {
+ if (timeout >= 0) {
remaining = deadline - System.currentTimeMillis();
if (remaining <= 0) {
return false; // Reach if timeout is over and no finish.
