rework use of ClassLoaders, see #1736

2012-01-27 13:30:43 +01:00 · 2012-01-27 13:30:43 +01:00 · ac1ee9ae91
commit ac1ee9ae91
parent c5fc153a10
13 changed files with 54 additions and 67 deletions
--- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala
+++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala
@ -81,10 +81,10 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
  def deserialize(bytes: Array[Byte],
                  serializerId: Int,
                  clazz: Option[Class[_]],
-                  classLoader: Option[ClassLoader]): Either[Exception, AnyRef] =
+                  classLoader: ClassLoader): Either[Exception, AnyRef] =
    try {
      currentSystem.withValue(system) {
-        Right(serializerByIdentity(serializerId).fromBinary(bytes, clazz, classLoader))
+        Right(serializerByIdentity(serializerId).fromBinary(bytes, clazz, Some(classLoader)))
      }
    } catch { case e: Exception ⇒ Left(e) }