From 67b2cb3356407bb6e50c5963f16ad156b24bbab8 Mon Sep 17 00:00:00 2001
From: Dian Fu <dianfu@apache.org>
Date: Tue, 13 Apr 2021 16:58:58 +0800
Subject: [PATCH] [hotfix][python] Fix possible null pointer exception in
 PythonDriver

---
 .../main/java/org/apache/flink/client/python/PythonDriver.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-python/src/main/java/org/apache/flink/client/python/PythonDriver.java b/flink-python/src/main/java/org/apache/flink/client/python/PythonDriver.java
index 1cd9f583367fb..f560f3c038650 100644
--- a/flink-python/src/main/java/org/apache/flink/client/python/PythonDriver.java
+++ b/flink-python/src/main/java/org/apache/flink/client/python/PythonDriver.java
@@ -132,7 +132,7 @@ public static void main(String[] args) throws Throwable {
             }
         } finally {
             PythonEnvUtils.setGatewayServer(null);
-            if (Runtime.getRuntime().removeShutdownHook(shutdownHook)) {
+            if (shutdownHook != null && Runtime.getRuntime().removeShutdownHook(shutdownHook)) {
                 shutdownHook.run();
             }
         }