diff options
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkContext.scala | 4 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index 588e25ca24..ddd7d60d96 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -956,7 +956,7 @@ class SparkContext( } } - def getCheckpointDir = checkpointDir.getOrElse(null) + def getCheckpointDir = checkpointDir /** Default level of parallelism to use when not given by user (e.g. parallelize and makeRDD). */ def defaultParallelism: Int = taskScheduler.defaultParallelism @@ -1127,7 +1127,7 @@ object SparkContext { if (sparkHome != null) { res.setSparkHome(sparkHome) } - if (null != jars && !jars.isEmpty) { + if (jars != null && !jars.isEmpty) { res.setJars(jars) } res.setExecutorEnv(environment.toSeq) diff --git a/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala b/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala index 8041163e3d..5bd5bfd8c5 100644 --- a/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala +++ b/core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala @@ -401,6 +401,8 @@ class JavaSparkContext(val sc: SparkContext) extends JavaSparkContextVarargsWork sc.setCheckpointDir(dir) } + def getCheckpointDir = sc.checkpointDir.getOrElse(null) + protected def checkpointFile[T](path: String): JavaRDD[T] = { implicit val cm: ClassTag[T] = implicitly[ClassTag[AnyRef]].asInstanceOf[ClassTag[T]] |