Merge branch 'v0.17.x_bugfix' into v0.17.x

integrity-tf · Jul 4, 2018 · 005dda1 · 005dda1
2 parents 4a1b0f5 + dea1a2d
commit 005dda1
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/de.gebit.integrity.runner/src/de/gebit/integrity/runner/DefaultTestRunner.java b/de.gebit.integrity.runner/src/de/gebit/integrity/runner/DefaultTestRunner.java
@@ -1533,7 +1533,13 @@ protected void defineVariable(final VariableOrConstantEntity anEntity, Object an
 		// We need to send variable updates to forks in the main phase here.
 		boolean tempSendToForks = (!isFork()) && shouldExecuteFixtures();
 
-		setVariableValue(anEntity, tempInitialValue, tempSendToForks);
+		if (isFork() && !shouldExecuteFixtures()) {
+			// Skip the variable definition if we are on a fork AND the fork is not currently executing stuff
+			// The initial value of these variables should have already been provided by the master, re-setting
+			// could cause trouble, as we might literally reset the value to an old one! See issue #194.
+		} else {
+			setVariableValue(anEntity, tempInitialValue, tempSendToForks);
+		}
 
 		if (currentCallback != null) {
 			Runnable tempRunnable = new Runnable() {