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

Removing the 'def config', removing the null check for every message being processed and adding some TODOs

Browse source
This commit is contained in:
Viktor Klang 2011-10-19 17:48:27 +02:00
parent f68c170ba8
commit 83e17aa8ea
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -212,12 +212,10 @@ trait Actor {
implicit def app = context.app
private def config = context.app.AkkaConfig
/**
* The default timeout, based on the config setting 'akka.actor.timeout'
*/
implicit def defaultTimeout = config.ActorTimeout
implicit def defaultTimeout = app.AkkaConfig.ActorTimeout
/**
* Wrap a Receive partial function in a logging enclosure, which sends a
@ -233,7 +231,7 @@ trait Actor {
* This method does NOT modify the given Receive unless
* akka.actor.debug.receive is set within akka.conf.
*/
def loggable(self: AnyRef)(r: Receive): Receive = if (config.AddLoggingReceive) LoggingReceive(self, r) else r
def loggable(self: AnyRef)(r: Receive): Receive = if (app.AkkaConfig.AddLoggingReceive) LoggingReceive(self, r) else r //TODO FIXME Shouldn't this be in a Loggable-trait?
/**
* Some[ActorRef] representation of the 'self' ActorRef reference.
@ -241,7 +239,7 @@ trait Actor {
* Mainly for internal use, functions as the implicit sender references when invoking
* the 'forward' function.
*/
def someSelf: Some[ActorRef with ScalaActorRef] = Some(context.self)
def someSelf: Some[ActorRef with ScalaActorRef] = Some(context.self) //TODO FIXME we might not need this when we switch to sender-in-scope-always
/*
* Option[ActorRef] representation of the 'self' ActorRef reference.
@ -249,7 +247,7 @@ trait Actor {
* Mainly for internal use, functions as the implicit sender references when invoking
* one of the message send functions ('!' and '?').
*/
def optionSelf: Option[ActorRef with ScalaActorRef] = someSelf
def optionSelf: Option[ActorRef with ScalaActorRef] = someSelf //TODO FIXME we might not need this when we switch to sender-in-scope-always
/**
* The 'self' field holds the ActorRef for this actor.
@ -272,7 +270,7 @@ trait Actor {
*/
def channel: UntypedChannel = context.channel
// just for current compatibility
// TODO FIXME REMOVE ME just for current compatibility
implicit def forwardable: ForwardableChannel = ForwardableChannel(channel)
/**
@ -387,11 +385,9 @@ trait Actor {
// =========================================
private[akka] final def apply(msg: Any) = {
if (msg.isInstanceOf[AnyRef] && (msg.asInstanceOf[AnyRef] eq null))
throw new InvalidMessageException("Message from [" + channel + "] to [" + self + "] is null")
def autoReceiveMessage(msg: AutoReceivedMessage) {
if (config.DebugAutoReceive) app.eventHandler.debug(this, "received AutoReceiveMessage " + msg)
if (app.AkkaConfig.DebugAutoReceive) app.eventHandler.debug(this, "received AutoReceiveMessage " + msg)
msg match {
case HotSwap(code, discardOld) ⇒ become(code(self), discardOld)

4
akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
View file

@ -17,7 +17,9 @@ import scala.annotation.tailrec
/**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
final case class Envelope(val message: Any, val channel: UntypedChannel)
final case class Envelope(val message: Any, val channel: UntypedChannel) {
if (message.isInstanceOf[AnyRef] && (message.asInstanceOf[AnyRef] eq null)) throw new InvalidMessageException("Message is null")
}
object SystemMessage {
@tailrec