Skip to content

Commit 7ab9a5d

Browse files
committed
Merge remote-tracking branch 'origin/1.10_release_4.0.x' into 1.10_release_4.0.x
2 parents c068a7c + 38079c1 commit 7ab9a5d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/src/main/java/com/dtstack/flink/sql/environment/StreamEnvConfigManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public static void streamExecutionEnvironmentConfig(StreamExecutionEnvironment s
8585
ExecutionConfig exeConfig = streamEnv.getConfig();
8686
if (exeConfig.getGlobalJobParameters() == null) {
8787
exeConfig.setGlobalJobParameters(globalJobParameters);
88-
} else if (exeConfig.getGlobalJobParameters() instanceof Configuration) {
89-
((Configuration) exeConfig.getGlobalJobParameters()).addAll(globalJobParameters);
88+
} else if (exeConfig.getGlobalJobParameters() instanceof ExecutionConfig.GlobalJobParameters) {
89+
exeConfig.setGlobalJobParameters(globalJobParameters);
9090
}
9191

9292
getEnvParallelism(confProperties).ifPresent(streamEnv::setParallelism);

0 commit comments

Comments
 (0)