fix for #114: issue with specialized types in WrappedArray instances

Author: ryanlecompte

chill-scala/src/main/scala/com/twitter/chill/WrappedArraySerializer.scala

@@ -18,31 +18,25 @@ package com.twitter.chill
 
 import scala.collection.mutable.{WrappedArray, WrappedArrayBuilder}
 
-class WrappedArraySerializer[T] extends KSerializer[WrappedArray[T]] {
+class WrappedArraySerializer[T: ClassManifest] extends KSerializer[WrappedArray[T]] {
 
   def write(kser: Kryo, out: Output, obj: WrappedArray[T]) {
-    // Write the class-manifest, we don't use writeClass because it
-    // uses the registration system, and this class might not be registered
-    kser.writeObject(out, obj.elemManifest.erasure)
     out.writeInt(obj.size, true)
     obj.foreach { t  =>
       val tRef = t.asInstanceOf[AnyRef]
-      kser.writeObject(out, tRef)
+      kser.writeClassAndObject(out, tRef)
       // After each intermediate object, flush
-      out.flush
+      out.flush()
     }
   }
 
   def read(kser: Kryo, in: Input, cls: Class[WrappedArray[T]]) = {
-    // Write the class-manifest, we don't use writeClass because it
-    // uses the registration system, and this class might not be registered
-    val clazz = kser.readObject(in, classOf[Class[T]]).asInstanceOf[Class[T]]
     val size = in.readInt(true)
-    val bldr = new WrappedArrayBuilder[T](ClassManifest.fromClass[T](clazz))
+    val bldr = new WrappedArrayBuilder[T](classManifest[T])
     bldr.sizeHint(size)
     (0 until size).foreach { idx =>
-      bldr += kser.readObject(in, clazz)
+      bldr += kser.readClassAndObject(in).asInstanceOf[T]
     }
-    bldr.result
+    bldr.result()
   }
 }

chill-scala/src/test/scala/com/twitter/chill/KryoSpec.scala

@@ -97,8 +97,16 @@ class KryoSpec extends Specification with BaseProperties {
       arrayRT(Array(0.1))
       arrayRT(Array("hey"))
       arrayRT(Array((0,1)))
+      arrayRT(Array((0,1), (1,0)))
       arrayRT(Array(None, Nil, None, Nil))
     }
+    "handle WrappedArray instances" in {
+      val tests = Seq(
+        Array((1,1), (2,2), (3,3)).toSeq,
+        Array((1.0, 1.0), (2.0, 2.0)).toSeq,
+        Array((1.0, "1.0"), (2.0, "2.0")).toSeq)
+      tests.foreach { test => rt(test) must be_==(test) }
+    }
     "handle lists of lists" in {
       val lol = List(("us", List(1)), ("jp", List(3, 2)), ("gb", List(3, 1)))
       rt(lol) must be_==(lol)