Skip to content

Commit

Permalink
SPARK-4660: Use correct class loader in JavaSerializer (copy of PR ap…
Browse files Browse the repository at this point in the history
…ache#3840...

... 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)
  • Loading branch information
jacek-lewandowski authored and pwendell committed Jan 20, 2015
1 parent 8140802 commit c93a57f
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit c93a57f

Please sign in to comment.