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

Manual inlining and indentation

Browse source
This commit is contained in:
Viktor Klang 2011-02-15 01:28:29 +01:00
parent 2fc0e116cf
commit 808426d59d
2 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -458,7 +458,7 @@ trait Actor extends Logging {
private lazy val processingBehavior: Receive = {
val defaultBehavior = receive
val actorBehavior: Receive = {
case l: AutoReceivedMessage => autoReceiveMessage(l)
case l: AutoReceivedMessage => autoReceiveMessage(l)
case msg if self.hotswap.nonEmpty &&
self.hotswap.head.isDefinedAt(msg) => self.hotswap.head.apply(msg)
case msg if self.hotswap.isEmpty &&
@ -470,7 +470,7 @@ trait Actor extends Logging {
private lazy val fullBehavior: Receive = {
val defaultBehavior = receive
val actorBehavior: Receive = {
case l: AutoReceivedMessage => autoReceiveMessage(l)
case l: AutoReceivedMessage => autoReceiveMessage(l)
case msg if self.hotswap.nonEmpty &&
self.hotswap.head.isDefinedAt(msg) => self.hotswap.head.apply(msg)
case msg if self.hotswap.isEmpty &&

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

@ -829,7 +829,16 @@ class LocalActorRef private[akka] (
else {
currentMessage = messageHandle
try {
dispatch(messageHandle)
Actor.log.slf4j.trace("Invoking actor with message: {}\n", messageHandle)
try {
cancelReceiveTimeout // FIXME: leave this here?
actor(messageHandle.message)
} catch {
case e: InterruptedException => {} // received message while actor is shutting down, ignore
case e => handleExceptionInDispatch(e, messageHandle.message)
} finally {
checkReceiveTimeout // Reschedule receive timeout
}
} catch {
case e =>
Actor.log.slf4j.error("Could not invoke actor [{}]", this)
@ -1003,22 +1012,6 @@ class LocalActorRef private[akka] (
a
}
private def dispatch[T](messageHandle: MessageInvocation) = {
Actor.log.slf4j.trace("Invoking actor with message: {}\n", messageHandle)
val message = messageHandle.message //serializeMessage(messageHandle.message)
try {
cancelReceiveTimeout // FIXME: leave this here?
actor(message)
} catch {
case e: InterruptedException => {} // received message while actor is shutting down, ignore
case e => handleExceptionInDispatch(e, message)
}
finally {
checkReceiveTimeout // Reschedule receive timeout
}
}
private def shutDownTemporaryActor(temporaryActor: ActorRef) {
Actor.log.slf4j.info("Actor [{}] configured as TEMPORARY and will not be restarted.", temporaryActor.id)
temporaryActor.stop