Addressed Patrick's comments.

tdas · tdas · commit f346f71db69c · 2014-05-19T21:46:31.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -718,7 +718,7 @@ class SparkContext(config: SparkConf) extends Logging {
       minPartitions: Int = defaultMinPartitions
       ): RDD[T] = {
     sequenceFile(path, classOf[NullWritable], classOf[BytesWritable], minPartitions)
-      .flatMap(x => Utils.deserialize[Array[T]](x._2.getBytes, Thread.currentThread.getContextClassLoader))
+      .flatMap(x => Utils.deserialize[Array[T]](x._2.getBytes, Utils.getContextOrSparkClassLoader))
   }
 
   protected[spark] def checkpointFile[T: ClassTag](

Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ class SparkContext(config: SparkConf) extends Logging {`
`718`	`718`	`minPartitions: Int = defaultMinPartitions`
`719`	`719`	`): RDD[T] = {`
`720`	`720`	`sequenceFile(path, classOf[NullWritable], classOf[BytesWritable], minPartitions)`
`721`		`- .flatMap(x => Utils.deserialize[Array[T]](x._2.getBytes, Thread.currentThread.getContextClassLoader))`
	`721`	`+ .flatMap(x => Utils.deserialize[Array[T]](x._2.getBytes, Utils.getContextOrSparkClassLoader))`
`722`	`722`	`}`
`723`	`723`
`724`	`724`	`protected[spark] def checkpointFile[T: ClassTag](`