From 967cbc7107a25e6973b7edcee56764a90403920e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Osipiuk?= <lukasz@osipiuk.net>
Date: Wed, 21 Sep 2022 17:03:44 +0200
Subject: [PATCH] Add guards to prevent possible NPE in test cleanup

It was possible for executorService to not be initialized if setup() was
not called due to failure in initialization driven by superclass.
---
 .../trino/testing/AbstractDistributedEngineOnlyQueries.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
index ae417103b393..bc36757a7840 100644
--- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
+++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractDistributedEngineOnlyQueries.java
@@ -54,7 +54,10 @@ public void setUp()
     @AfterClass(alwaysRun = true)
     public void shutdown()
     {
-        executorService.shutdownNow();
+        if (executorService != null) {
+            executorService.shutdownNow();
+            executorService = null;
+        }
     }
 
     /**