diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-03-08 10:28:50 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-03-08 10:28:50 -0800 |
| commit | d39f5dd15e45099b51d64eb9b9ede26dafa0b003 (patch) | |
| tree | 5b847dac794398d8effa026118ed4fe744aff567 /core | |
| parent | 8b6f3db415926a6a5723b23bc3e9f993bcbbfa74 (diff) | |
| parent | 4f0d0a7b73081e6e0afb587ad1893cbaad04136d (diff) | |
| download | spark-d39f5dd15e45099b51d64eb9b9ede26dafa0b003.tar.gz spark-d39f5dd15e45099b51d64eb9b9ede26dafa0b003.tar.bz2 spark-d39f5dd15e45099b51d64eb9b9ede26dafa0b003.zip | |
Merge remote branch 'origin/custom-serialization' into new-rdds
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/KryoSerialization.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/spark/KryoSerialization.scala b/core/src/main/scala/spark/KryoSerialization.scala index f6e818adb0..cd169fa7ab 100644 --- a/core/src/main/scala/spark/KryoSerialization.scala +++ b/core/src/main/scala/spark/KryoSerialization.scala @@ -118,6 +118,7 @@ class KryoSerialization extends SerializationStrategy with Logging { val toRegister: Seq[AnyRef] = Seq( // Arrays Array(1), Array(1.0), Array(1.0f), Array(1L), Array(""), Array(("", "")), + Array(new java.lang.Object), // Specialized Tuple2s ("", ""), (1, 1), (1.0, 1.0), (1L, 1L), (1, 1.0), (1.0, 1), (1L, 1.0), (1.0, 1L), (1, 1L), (1L, 1), |