From d2fa7e8751b38abf378610f16c7cd0f2c80753ba Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Sun, 27 May 2018 02:06:46 -0700
Subject: [PATCH] Do null-safe Apache Geode/Pivotal GemFire Server Process stop
 inside test suite tear down method.

---
 .../integration/ForkingClientServerIntegrationTestsSupport.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
index 2f35d15..add747a 100644
--- a/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
+++ b/spring-test-data-geode/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java
@@ -75,7 +75,7 @@ public abstract class ForkingClientServerIntegrationTestsSupport extends ClientS
 
 	@AfterClass
 	public static void stopGemFireServer() {
-		stop(gemfireServer);
+		getGemFireServerProcess().ifPresent(ForkingClientServerIntegrationTestsSupport::stop);
 		setGemFireServerProcess(null);
 	}