Skip to content

Commit

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

... by Piotr Kolaczkowski)

Author: Jacek Lewandowski <lewandowski.jacek@gmail.com>

Closes #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 #3840 by Piotr Kolaczkowski)

(cherry picked from commit c93a57f)
Signed-off-by: Patrick Wendell <patrick@databricks.com>
  • Loading branch information
jacek-lewandowski authored and pwendell committed Jan 20, 2015
1 parent 228bf6c commit 692dc5b
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 692dc5b

Please sign in to comment.