Fixed issue #194: Suite Parameters Unexpectedly null If Run On Forks

integrity-tf · Jul 4, 2018 · dea1a2d · dea1a2d
1 parent a1d31b9
commit dea1a2d
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() {