1 files changed, 18 insertions, 18 deletions

diff --git a/src/library/scala/util/Marshal.scala b/src/library/scala/util/Marshal.scala
index c2269cde45..6eb58e8570 100644
--- a/src/library/scala/util/Marshal.scala
+++ b/src/library/scala/util/Marshal.scala
@@ -11,19 +11,19 @@
 package scala.util
 
 /**
- * Marshalling of Scala objects using Scala manifests.
+ * Marshalling of Scala objects using Scala tags.
  *
  * @author Stephane Micheloud
  * @version 1.0
  */
 object Marshal {
   import java.io._
-  import scala.reflect.ClassManifest
+  import scala.reflect.ClassTag
 
-  def dump[A](o: A)(implicit m: ClassManifest[A]): Array[Byte] = {
+  def dump[A](o: A)(implicit t: ClassTag[A]): Array[Byte] = {
     val ba = new ByteArrayOutputStream(512)
     val out = new ObjectOutputStream(ba)
-    out.writeObject(m)
+    out.writeObject(t)
     out.writeObject(o)
     out.close()
     ba.toByteArray()
@@ -32,20 +32,20 @@ object Marshal {
   @throws(classOf[IOException])
   @throws(classOf[ClassCastException])
   @throws(classOf[ClassNotFoundException])
-  def load[A](buffer: Array[Byte])(implicit expected: ClassManifest[A]): A = {
+  def load[A](buffer: Array[Byte])(implicit expected: ClassTag[A]): A = {
     val in = new ObjectInputStream(new ByteArrayInputStream(buffer))
-    val found = in.readObject.asInstanceOf[ClassManifest[_]]
-    // todo. [Eugene] needs review, since ClassManifests no longer capture typeArguments
-    if (found.tpe <:< expected.tpe) {
-      val o = in.readObject.asInstanceOf[A]
-      in.close()
-      o
-    } else {
-      in.close()
-      throw new ClassCastException("type mismatch;"+
-        "\n found   : "+found+
-        "\n required: "+expected)
+    val found = in.readObject.asInstanceOf[ClassTag[_]]
+    try {
+      // [Eugene] needs review
+      // previously was: found <:< expected
+      found.erasure.asSubclass(expected.erasure)
+      in.readObject.asInstanceOf[A]
+    } catch {
+      case _: ClassCastException =>
+        in.close()
+        throw new ClassCastException("type mismatch;"+
+          "\n found   : "+found+
+          "\n required: "+expected)
     }
   }
-
-}
+}
\ No newline at end of file