[Swift-commit] cog r3714

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3714 | hategan | 2013-07-10 01:07:36 -0500 (Wed, 10 Jul 2013) | 1 line

fixed a bug introduced by recent commits that would prevent included files from being run if re-running in the same jvm
------------------------------------------------------------------------
Index: modules/karajan/src/org/globus/cog/karajan/workflow/nodes/Include.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/workflow/nodes/Include.java	(revision 3713)
+++ modules/karajan/src/org/globus/cog/karajan/workflow/nodes/Include.java	(working copy)
@@ -156,6 +156,7 @@
 		if (hasProperty("_processed")) {
 			return;
 		}
+		int childCountBeforeInclude = this.elementCount();
 		A_FILE.setStatic(this, iname);
 		logger.debug("Importing: " + iname);
 		Reader reader = null;
@@ -289,7 +290,7 @@
 				throw new ExecutionException("Internal error. No reader set");
 			}
 		}
-		setProperty("_processed", elementCount());
+		setProperty("_processed", childCountBeforeInclude);
 	}
 
 	public void loadStarted() {