From ddef7e348ff275618ddb0442be2bf8d408ab64f6 Mon Sep 17 00:00:00 2001
From: Ricardo Larrahondo <ricardo.larrahondo@avaldigitallabs.com>
Date: Thu, 3 Dec 2020 17:59:33 -0500
Subject: [PATCH] :bug: FIX a bug that causes current context to be override
 when calling getEnvironmentVariables method in TestOutcome (#2326)

FIX #2129
possible FIX #2172
---
 .../src/main/java/net/thucydides/core/model/TestOutcome.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/serenity-model/src/main/java/net/thucydides/core/model/TestOutcome.java b/serenity-model/src/main/java/net/thucydides/core/model/TestOutcome.java
index b71526b21b..b517a744ec 100644
--- a/serenity-model/src/main/java/net/thucydides/core/model/TestOutcome.java
+++ b/serenity-model/src/main/java/net/thucydides/core/model/TestOutcome.java
@@ -405,7 +405,9 @@ public void setEnvironmentVariables(EnvironmentVariables environmentVariables) {
     public EnvironmentVariables getEnvironmentVariables() {
         if (environmentVariables == null) {
             environmentVariables = Injectors.getInjector().getProvider(EnvironmentVariables.class).get();
-            this.context = contextFrom(environmentVariables);
+            if(this.context==null){
+                this.context = contextFrom(environmentVariables);
+            }
         }
         return environmentVariables;
     }