From 5da601c47e8ec49a1413691acde7f56f16c27127 Mon Sep 17 00:00:00 2001
From: Laksh Singla <lakshsingla@gmail.com>
Date: Tue, 6 Jun 2023 17:01:42 +0530
Subject: [PATCH] fix npe (#14369)

---
 .../main/java/org/apache/druid/msq/exec/ControllerImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java
index db7a0f38b00..bf16412b0ee 100644
--- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java
+++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java
@@ -356,7 +356,9 @@ public class ControllerImpl implements Controller
         }
     );
 
-    workerTaskLauncher.waitForWorkerShutdown();
+    if (workerTaskLauncher != null) {
+      workerTaskLauncher.waitForWorkerShutdown();
+    }
   }
 
   public TaskStatus runTask(final Closer closer)