SPARK-4660: Use correct class loader in JavaSerializer (copy of PR apache#3840...

jacek-lewandowski · pwendell · commit c93a57f0d6dc · 2015-01-20T12:38:01.000-08:00
... by Piotr Kolaczkowski) Author: Jacek Lewandowski <lewandowski.jacek@gmail.com> Closes apache#4113 from jacek-lewandowski/SPARK-4660-master and squashes the following commits: a5e84ca [Jacek Lewandowski] SPARK-4660: Use correct class loader in JavaSerializer (copy of PR apache#3840 by Piotr Kolaczkowski)
diff --git a/core/src/main/scala/org/apache/spark/serializer/JavaSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/JavaSerializer.scala
@@ -92,7 +92,7 @@ private[spark] class JavaSerializerInstance(counterReset: Int, defaultClassLoade
   }
 
   override def deserializeStream(s: InputStream): DeserializationStream = {
-    new JavaDeserializationStream(s, Utils.getContextOrSparkClassLoader)
+    new JavaDeserializationStream(s, defaultClassLoader)
   }
 
   def deserializeStream(s: InputStream, loader: ClassLoader): DeserializationStream = {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ private[spark] class JavaSerializerInstance(counterReset: Int, defaultClassLoade`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`override def deserializeStream(s: InputStream): DeserializationStream = {`
`95`		`- new JavaDeserializationStream(s, Utils.getContextOrSparkClassLoader)`
	`95`	`+ new JavaDeserializationStream(s, defaultClassLoader)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`def deserializeStream(s: InputStream, loader: ClassLoader): DeserializationStream = {`