diff options
| author | Jacek Lewandowski <lewandowski.jacek@gmail.com> | 2015-01-20 12:38:01 -0800 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-01-20 12:38:09 -0800 |
| commit | 692dc5b66cae25fc39f89436d907223c99c77f96 (patch) | |
| tree | db79446101344764c40d582321411059fd7e1043 | |
| parent | 228bf6cefb12dc2d8cea4cc86f0591461ecb5c74 (diff) | |
| download | spark-692dc5b66cae25fc39f89436d907223c99c77f96.tar.gz spark-692dc5b66cae25fc39f89436d907223c99c77f96.tar.bz2 spark-692dc5b66cae25fc39f89436d907223c99c77f96.zip | |
SPARK-4660: Use correct class loader in JavaSerializer (copy of PR #3840...
... 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 c93a57f0d6dc32b127aa68dbe4092ab0b22a9667)
Signed-off-by: Patrick Wendell <patrick@databricks.com>
| -rw-r--r-- | core/src/main/scala/org/apache/spark/serializer/JavaSerializer.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 662a7b9124..fa8a337ad6 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 = { |