[FLINK-2990] Fix Flink on YARN for Scala 2.11

nltran · Nov 9, 2015 · ccf4ebd · ccf4ebd
1 parent 4462f53
commit ccf4ebd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -374,7 +374,7 @@ public int run(String[] args) {
  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
@@ -256,7 +256,7 @@ public void setShipFiles(List<File> shipFiles) {
  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);
  }
  }