[flink] 22/34: [apple] Always use pipeline.name when configured

[mbalassi]

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

mbalassi pushed a commit to branch release-1.15.2.4-acs
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 28a0f6823923c050ee23380f20fcb891cc40b9ce
Author: Gyula Fora <g_f...@apple.com>
AuthorDate: Tue Jul 26 15:41:06 2022 +0200

    [apple] Always use pipeline.name when configured
---
 .../flink/streaming/api/environment/StreamExecutionEnvironment.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
 
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
index 54dca343f61..4fab07c72e0 100644
--- 
a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
+++ 
b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
@@ -1965,7 +1965,9 @@ public class StreamExecutionEnvironment {
     public JobExecutionResult execute(String jobName) throws Exception {
         Preconditions.checkNotNull(jobName, "Streaming Job name should not be 
null.");
         final StreamGraph streamGraph = getStreamGraph();
-        streamGraph.setJobName(jobName);
+        if (!configuration.contains(PipelineOptions.NAME)) {
+            streamGraph.setJobName(jobName);
+        }
         return execute(streamGraph);
     }