[incubator-dolphinscheduler] branch dev updated: [Fix][Flink] Fix flink -yn option missing after upgrading (#4682)

[lidongdai]

This is an automated email from the ASF dual-hosted git repository.

lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new b3bb846  [Fix][Flink] Fix flink -yn option missing after upgrading 
(#4682)
b3bb846 is described below

commit b3bb84631ec268a9ab7e19ebb6c6bfa3c092f7f5
Author: Shiwen Cheng <chengshiwen0...@gmail.com>
AuthorDate: Thu Feb 4 23:21:44 2021 +0800

    [Fix][Flink] Fix flink -yn option missing after upgrading (#4682)
---
 .../java/org/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 2431eed..519ddf2 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);