[Cogkit-svn] SF.net SVN: cogkit: [1995] trunk/current/src/cog/modules/karajan/src/org/ globus/cog/karajan/workflow/nodes/WaitNode.java

[<ha...@us...>]

Revision: 1995
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1995&view=rev
Author:   hategan
Date:     2008-04-30 16:34:45 -0700 (Wed, 30 Apr 2008)

Log Message:
-----------
fixed aborts in wait()

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/WaitNode.java

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/WaitNode.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/WaitNode.java	2008-04-30 23:33:53 UTC (rev 1994)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/workflow/nodes/WaitNode.java	2008-04-30 23:34:45 UTC (rev 1995)
@@ -43,6 +43,7 @@
 		if (stack.isDefined("#abort")) {
 			logger.debug("Aborting wait");
 			abort(stack);
+			return;
 		}
 		logger.debug("Stateful element count: "
 				+ stack.getExecutionContext().getStateManager().getExecuting().size());
@@ -54,12 +55,12 @@
 			}
 		}
 		if (A_DELAY.isPresent(stack)) {
-			timer.schedule(new Task(this, stack), TypeUtil.toInt(A_DELAY.getValue(stack)));
+			timer.schedule(newTask(stack), TypeUtil.toInt(A_DELAY.getValue(stack)));
 		}
 		else if (A_UNTIL.isPresent(stack)) {
 			String until = TypeUtil.toString(A_UNTIL.getValue(stack));
 			try {
-				timer.schedule(new Task(this, stack), DateFormat.getDateTimeInstance().parse(until));
+				timer.schedule(newTask(stack), DateFormat.getDateTimeInstance().parse(until));
 			}
 			catch (ParseException e) {
 				try {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.