Merge branch 'hotfix_1.10_4.2.x_35786' into 1.10_test_4.2.x

gituser · gituser · commit fe587145b297 · 2021-03-23T19:58:43.000+08:00
diff --git a/core/src/main/java/com/dtstack/flink/sql/exec/ExecuteProcessHelper.java b/core/src/main/java/com/dtstack/flink/sql/exec/ExecuteProcessHelper.java
@@ -138,8 +138,7 @@ public static ParamsInfo parseParams(String[] args) throws Exception {
         }
 
         if (!pluginLoadMode.equalsIgnoreCase(EPluginLoadMode.LOCALTEST.name()) && Objects.isNull(dirtyProperties.get(PLUGIN_PATH_STR))) {
-            dirtyProperties.put(PLUGIN_PATH_STR,
-                    Objects.isNull(remoteSqlPluginPath) ? localSqlPluginPath : remoteSqlPluginPath);
+            dirtyProperties.put(PLUGIN_PATH_STR, localSqlPluginPath);
         }
 
         List<URL> jarUrlList = getExternalJarUrls(options.getAddjar());

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,7 @@ public static ParamsInfo parseParams(String[] args) throws Exception {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`if (!pluginLoadMode.equalsIgnoreCase(EPluginLoadMode.LOCALTEST.name()) && Objects.isNull(dirtyProperties.get(PLUGIN_PATH_STR))) {`
`141`		`- dirtyProperties.put(PLUGIN_PATH_STR,`
`142`		`- Objects.isNull(remoteSqlPluginPath) ? localSqlPluginPath : remoteSqlPluginPath);`
	`141`	`+ dirtyProperties.put(PLUGIN_PATH_STR, localSqlPluginPath);`
`143`	`142`	`}`
`144`	`143`
`145`	`144`	`List<URL> jarUrlList = getExternalJarUrls(options.getAddjar());`