From dea1a2d764464f6857553bcebb0227d13beb0dae Mon Sep 17 00:00:00 2001
From: Rene Schneider <rene.schneider@gebit.de>
Date: Wed, 4 Jul 2018 17:47:42 +0200
Subject: [PATCH] Fixed issue #194: Suite Parameters Unexpectedly null If Run
 On Forks

---
 .../src/de/gebit/integrity/runner/DefaultTestRunner.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 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
index b2a22c55d..f0ddb3aaf 100644
--- 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() {