Skip to content

Commit d208e33

Browse files
author
Marcelo Vanzin
committed
Feedback.
1 parent 466f84a commit d208e33

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S
282282
if (master.startsWith("yarn")) {
283283
val hasHadoopEnv = env.contains("HADOOP_CONF_DIR") || env.contains("YARN_CONF_DIR")
284284
if (!hasHadoopEnv && !Utils.isTesting) {
285-
throw new Exception(s"When running with master '$master' " +
285+
error(s"When running with master '$master' " +
286286
"either HADOOP_CONF_DIR or YARN_CONF_DIR must be set in the environment.")
287287
}
288288
}

launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder {
120120
this.parsedArgs = new ArrayList<>();
121121
boolean isExample = false;
122122
List<String> submitArgs = args;
123-
this.userArgs = null;
123+
this.userArgs = Collections.emptyList();
124124

125125
if (args.size() > 0) {
126126
switch (args.get(0)) {
@@ -170,7 +170,7 @@ List<String> buildSparkSubmitArgs() {
170170

171171
// If the user args array is not empty, we need to parse it to detect exactly what
172172
// the user is trying to run, so that checks below are correct.
173-
if (userArgs != null && !userArgs.isEmpty()) {
173+
if (!userArgs.isEmpty()) {
174174
parser.parse(userArgs);
175175
isStartingApp = parser.isAppResourceReq;
176176
}
@@ -419,7 +419,7 @@ private List<String> findExamplesJars() {
419419
private class OptionParser extends SparkSubmitOptionParser {
420420

421421
boolean isAppResourceReq = true;
422-
boolean errorOnUnknownArgs;
422+
private final boolean errorOnUnknownArgs;
423423

424424
OptionParser(boolean errorOnUnknownArgs) {
425425
this.errorOnUnknownArgs = errorOnUnknownArgs;

0 commit comments

Comments
 (0)