spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pwend...@apache.org
Subject spark git commit: SPARK-4660: Use correct class loader in JavaSerializer (copy of PR #3840...
Date Tue, 20 Jan 2015 20:38:22 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.1 3ee5c1711 -> ecdeca038


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>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ecdeca03
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ecdeca03
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ecdeca03

Branch: refs/heads/branch-1.1
Commit: ecdeca0388b5cf1cbbf9c5d79aa7b1bbaad1d7e4
Parents: 3ee5c17
Author: Jacek Lewandowski <lewandowski.jacek@gmail.com>
Authored: Tue Jan 20 12:38:01 2015 -0800
Committer: Patrick Wendell <patrick@databricks.com>
Committed: Tue Jan 20 12:38:20 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/ecdeca03/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: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message