raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fix actor ref spec

Browse source
This commit is contained in:
Peter Vlugter 2011-10-12 09:57:33 +02:00
parent 14751f7d29
commit 42e1bba164
6 changed files with 57 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

44
akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala
View file

@ -13,6 +13,7 @@ import akka.testkit.Testing.sleepFor
import java.lang.IllegalStateException
import akka.util.ReflectiveAccess
import akka.dispatch.{ DefaultPromise, Promise, Future }
import akka.serialization.Serialization
import java.util.concurrent.{ CountDownLatch, TimeUnit }
object ActorRefSpec {
@ -248,12 +249,35 @@ class ActorRefSpec extends AkkaSpec {
out.flush
out.close
val in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray))
val readA = in.readObject
Serialization.application.withValue(app) {
val in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray))
val readA = in.readObject
a.isInstanceOf[LocalActorRef] must be === true
readA.isInstanceOf[LocalActorRef] must be === true
(readA eq a) must be === true
a.isInstanceOf[LocalActorRef] must be === true
readA.isInstanceOf[LocalActorRef] must be === true
(readA eq a) must be === true
}
}
"throw an exception on deserialize if no application in scope" in {
val a = createActor[InnerActor]
import java.io._
val baos = new ByteArrayOutputStream(8192 * 32)
val out = new ObjectOutputStream(baos)
out.writeObject(a)
out.flush
out.close
val in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray))
(intercept[java.lang.IllegalStateException] {
in.readObject
}).getMessage must be === "Trying to deserialize a serialized ActorRef without an AkkaApplication in scope." +
" Use akka.serialization.Serialization.application.withValue(akkaApplication) { ... }"
}
"must throw exception on deserialize if not present in local registry and remoting is not enabled" in {
@ -287,10 +311,12 @@ class ActorRefSpec extends AkkaSpec {
a.stop()
latch.await(5, TimeUnit.SECONDS) must be === true
val in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray))
(intercept[java.lang.IllegalStateException] {
in.readObject
}).getMessage must be === "Trying to deserialize ActorRef [" + expectedSerializedRepresentation + "] but it's not found in the local registry and remoting is not enabled."
Serialization.application.withValue(app) {
val in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray))
(intercept[java.lang.IllegalStateException] {
in.readObject
}).getMessage must be === "Trying to deserialize ActorRef [" + expectedSerializedRepresentation + "] but it's not found in the local registry and remoting is not enabled."
}
}
"support nested createActors" in {

27
akka-actor/src/main/scala/akka/actor/ActorRef.scala
View file

@ -388,17 +388,22 @@ case class SerializedActorRef(uuid: Uuid,
import akka.serialization.Serialization._
@throws(classOf[java.io.ObjectStreamException])
def readResolve(): AnyRef = application.value.registry.local.actorFor(uuid) match {
case Some(actor) ⇒ actor
case None ⇒
//TODO FIXME Add case for when hostname+port == remote.address.hostname+port, should return a DeadActorRef or something
val remote = application.value.reflective.RemoteModule
if (remote.isEnabled)
RemoteActorRef(application.value, remote.defaultRemoteSupport.get(), new InetSocketAddress(hostname, port), address, None)
else
throw new IllegalStateException(
"Trying to deserialize ActorRef [" + this +
"] but it's not found in the local registry and remoting is not enabled.")
def readResolve(): AnyRef = {
if (application.value eq null) throw new IllegalStateException(
"Trying to deserialize a serialized ActorRef without an AkkaApplication in scope." +
" Use akka.serialization.Serialization.application.withValue(akkaApplication) { ... }")
application.value.registry.local.actorFor(uuid) match {
case Some(actor) ⇒ actor
case None ⇒
//TODO FIXME Add case for when hostname+port == remote.address.hostname+port, should return a DeadActorRef or something
val remote = application.value.reflective.RemoteModule
if (remote.isEnabled)
RemoteActorRef(application.value, remote.defaultRemoteSupport.get(), new InetSocketAddress(hostname, port), address, None)
else
throw new IllegalStateException(
"Trying to deserialize ActorRef [" + this +
"] but it's not found in the local registry and remoting is not enabled.")
}
}
}

4
akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala
View file

@ -56,8 +56,8 @@ trait ActorRefFactory {
def createActor[T <: Actor](clazz: Class[T]): ActorRef = createActor(Props(clazz))
def createActor(factory: ⇒ Actor): ActorRef = createActor(Props(() ⇒ factory))
def createActor(creator: UntypedActorFactory): ActorRef = createActor(Props(() => creator.create()))
def createActor(creator: UntypedActorFactory): ActorRef = createActor(Props(() ⇒ creator.create()))
def findActor(address: String): Option[ActorRef] = provider.findActorRef(address)

2
akka-http/src/main/scala/akka/http/JettyContinuation.scala
View file

@ -16,7 +16,7 @@ import akka.AkkaApplication
*/
trait JettyContinuation extends ContinuationListener {
import javax.servlet.http.HttpServletResponse
protected def application: AkkaApplication
val builder: () ⇒ tAsyncRequestContext

6
akka-http/src/main/scala/akka/http/Mist.scala
View file

@ -47,14 +47,12 @@ object Types {
def Headers(): Headers = Nil
}
/**
*
*/
trait Mist {
import javax.servlet.ServletContext
protected def application: AkkaApplication
/**
@ -124,7 +122,7 @@ trait Mist {
trait RootEndpointLocator {
var root: ActorRef = null
protected def application: AkkaApplication
def configureRoot(address: String) {

2
akka-http/src/main/scala/akka/http/Servlet30Context.scala
View file

@ -14,7 +14,7 @@ import akka.AkkaApplication
*/
trait Servlet30Context extends AsyncListener {
import javax.servlet.http.HttpServletResponse
protected def application: AkkaApplication
val builder: () ⇒ tAsyncRequestContext