From cd35a9e74b58f19b8cd805072e8bdf9c3ed1f171 Mon Sep 17 00:00:00 2001
From: chengshiwen <chengshiwen0103@gmail.com>
Date: Thu, 4 Feb 2021 17:12:20 +0800
Subject: [PATCH] [1.3.5-prepare][Fix][Flink] Fix flink -yn option missing
 after upgrading

---
 .../apache/dolphinscheduler/server/utils/FlinkArgsUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java
index 2431eedd1..519ddf205 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java
@@ -64,9 +64,9 @@ public class FlinkArgsUtils {
                 args.add(ArgsUtils.escape(appName));
             }
 
-            // judge flink version,from flink1.10,the parameter -yn removed
+            // judge flink version, the parameter -yn has removed from flink 1.10
             String flinkVersion = param.getFlinkVersion();
-            if (FLINK_VERSION_BEFORE_1_10.equals(flinkVersion)) {
+            if (flinkVersion == null || FLINK_VERSION_BEFORE_1_10.equals(flinkVersion)) {
                 int taskManager = param.getTaskManager();
                 if (taskManager != 0) {                        //-yn
                     args.add(Constants.FLINK_TASK_MANAGE);
-- 
GitLab