[incubator-dolphinscheduler] branch 1.3.5-prepare updated: [1.3.5-prepare][Fix][Flink] Fix flink -yn option missing after upgrading

[chenxingchun]

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

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


The following commit(s) were added to refs/heads/1.3.5-prepare by this push:
     new cd35a9e  [1.3.5-prepare][Fix][Flink] Fix flink -yn option missing 
after upgrading
     new 26b2152  Merge pull request #4681 from chengshiwen/1.3.5-fix-flink-yn
cd35a9e is described below

commit cd35a9e74b58f19b8cd805072e8bdf9c3ed1f171
Author: chengshiwen <chengshiwen0...@gmail.com>
AuthorDate: Thu Feb 4 17:12:20 2021 +0800

    [1.3.5-prepare][Fix][Flink] Fix flink -yn option missing after upgrading
---
 .../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);