Repository: spark Updated Branches: refs/heads/master 814080278 -> c93a57f0d
SPARK-4660: Use correct class loader in JavaSerializer (copy of PR #3840... ... by Piotr Kolaczkowski) Author: Jacek Lewandowski <[email protected]> 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) Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c93a57f0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c93a57f0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c93a57f0 Branch: refs/heads/master Commit: c93a57f0d6dc32b127aa68dbe4092ab0b22a9667 Parents: 8140802 Author: Jacek Lewandowski <[email protected]> Authored: Tue Jan 20 12:38:01 2015 -0800 Committer: Patrick Wendell <[email protected]> Committed: Tue Jan 20 12:38:01 2015 -0800 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/serializer/JavaSerializer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c93a57f0/core/src/main/scala/org/apache/spark/serializer/JavaSerializer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/serializer/JavaSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/JavaSerializer.scala index 662a7b9..fa8a337 100644 --- 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 = { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
