diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala index 553f6cf45b..3125431fb5 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala @@ -182,21 +182,15 @@ class SerializeSpec extends AkkaSpec(SerializeSpec.config) { "use ByteArraySerializer for byte arrays" in { val byteSerializer = ser.serializerFor(classOf[Array[Byte]]) - byteSerializer.getClass must be(classOf[ByteArraySerializer]) + byteSerializer.getClass must be theSameInstanceAs classOf[ByteArraySerializer] - val ba = "foo".getBytes("UTF-8") - - (byteSerializer.toBinary(ba) eq ba) must be === true - (byteSerializer.fromBinary(ba) eq ba) must be === true + for (a ← Seq("foo".getBytes("UTF-8"), null: Array[Byte], Array[Byte]())) + byteSerializer.fromBinary(byteSerializer.toBinary(a)) must be theSameInstanceAs a intercept[IllegalArgumentException] { byteSerializer.toBinary("pigdog") }.getMessage must be === "ByteArraySerializer only serializes byte arrays, not [pigdog]" - - byteSerializer.toBinary(null) must be === null - } - } } diff --git a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala b/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala index 4370bba23b..7a73eb3b15 100644 --- a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala +++ b/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala @@ -65,7 +65,7 @@ class ReflectiveDynamicAccess(val classLoader: ClassLoader) extends DynamicAcces override def getClassFor[T: ClassTag](fqcn: String): Try[Class[_ <: T]] = Try[Class[_ <: T]]({ - val c = Class.forName(fqcn, true, classLoader).asInstanceOf[Class[_ <: T]] + val c = Class.forName(fqcn, false, classLoader).asInstanceOf[Class[_ <: T]] val t = implicitly[ClassTag[T]].runtimeClass if (t.isAssignableFrom(c)) c else throw new ClassCastException(t + " is not assignable from " + c) }) @@ -101,5 +101,4 @@ class ReflectiveDynamicAccess(val classLoader: ClassLoader) extends DynamicAcces } recover { case i: InvocationTargetException if i.getTargetException ne null ⇒ throw i.getTargetException } } } - } \ No newline at end of file