From ccf4ebdd19a61777dbc3909a62916680be60caa8 Mon Sep 17 00:00:00 2001 From: Robert Metzger Date: Mon, 9 Nov 2015 17:55:56 +0100 Subject: [PATCH] [FLINK-2990] Fix Flink on YARN for Scala 2.11 --- .../main/java/org/apache/flink/client/FlinkYarnSessionCli.java | 2 +- .../main/java/org/apache/flink/yarn/FlinkYarnClientBase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java b/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java index 5daaf0e5d1c..a9a20ae286c 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java +++ b/flink-clients/src/main/java/org/apache/flink/client/FlinkYarnSessionCli.java @@ -374,7 +374,7 @@ public class FlinkYarnSessionCli { getYARNSessionCLIOptions(options); CommandLineParser parser = new PosixParser(); - CommandLine cmd = null; + CommandLine cmd; try { cmd = parser.parse(options, args); } catch(Exception e) { diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnClientBase.java b/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnClientBase.java index 452c73b5c99..8c4a53e9c1d 100644 --- a/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnClientBase.java +++ b/flink-yarn/src/main/java/org/apache/flink/yarn/FlinkYarnClientBase.java @@ -256,7 +256,7 @@ public abstract class FlinkYarnClientBase extends AbstractFlinkYarnClient { for(File shipFile: shipFiles) { // remove uberjar from ship list (by default everything in the lib/ folder is added to // the list of files to ship, but we handle the uberjar separately. - if(!(shipFile.getName().startsWith("flink-dist-") && shipFile.getName().endsWith("jar"))) { + if(!(shipFile.getName().startsWith("flink-dist") && shipFile.getName().endsWith("jar"))) { this.shipFiles.add(shipFile); } } -- GitLab