Skip to content

Commit bb751ce

Browse files
committed
fix null bug
1 parent 0226768 commit bb751ce

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,14 +262,14 @@ object SparkSubmit {
262262
val resolvedMavenCoordinates =
263263
SparkSubmitUtils.resolveMavenCoordinates(
264264
args.packages, Option(args.repositories), Option(args.ivyRepoPath))
265-
if (!resolvedMavenCoordinates.trim.isEmpty) {
266-
if (args.jars == null || args.jars.trim.isEmpty) {
265+
if (resolvedMavenCoordinates.trim.nonEmpty) {
266+
if (!args.isNonEmptyArg(args.jars)) {
267267
args.jars = resolvedMavenCoordinates
268268
} else {
269269
args.jars += s",$resolvedMavenCoordinates"
270270
}
271271
if (args.isPython) {
272-
if (args.pyFiles == null || args.pyFiles.trim.isEmpty) {
272+
if (!args.isNonEmptyArg(args.pyFiles)) {
273273
args.pyFiles = resolvedMavenCoordinates
274274
} else {
275275
args.pyFiles += s",$resolvedMavenCoordinates"
@@ -278,7 +278,7 @@ object SparkSubmit {
278278
}
279279
// install any R packages that may have been passed through --jars or --packages.
280280
// Spark Packages may contain R source code inside the jar.
281-
if (args.isR) {
281+
if (args.isR && args.isNonEmptyArg(args.jars)) {
282282
RPackageUtils.checkAndBuildRPackage(args.jars, printStream, args.verbose)
283283
}
284284

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,4 +595,7 @@ private[deploy] class SparkSubmitArguments(args: Seq[String], env: Map[String, S
595595
}
596596
}
597597

598+
private[deploy] def isNonEmptyArg(arg: String): Boolean = {
599+
arg != null && arg.nonEmpty
600+
}
598601
}

0 commit comments

Comments
 (0)