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

Removing @inline from Actor.sender since it cannot safely be inlined anyway. Also, changing the ordering of the checks for receiveTimeout_= so it passed -optimize compilation without whining

Browse source
This commit is contained in:
Viktor Klang 2011-11-23 12:28:20 +01:00
parent 36e85e9f23
commit 7d9a124b64
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -266,7 +266,6 @@ trait Actor {
* The reference sender Actor of the last received message.
* Is defined if the message was sent from another Actor, else None.
*/
@inline
final def sender: ActorRef = context.sender
/**

8
akka-actor/src/main/scala/akka/actor/ActorCell.scala
View file

@ -85,10 +85,12 @@ private[akka] class ActorCell(
final def provider = system.provider
def receiveTimeout: Option[Long] = if (receiveTimeoutData._1 > 0) Some(receiveTimeoutData._1) else None
override def receiveTimeout: Option[Long] = if (receiveTimeoutData._1 > 0) Some(receiveTimeoutData._1) else None
def receiveTimeout_=(timeout: Option[Long]): Unit =
receiveTimeoutData = (if (timeout.isEmpty || timeout.get < 1) -1 else timeout.get, receiveTimeoutData._2)
override def receiveTimeout_=(timeout: Option[Long]): Unit = {
val timeoutMs = if (timeout.isDefined && timeout.get > 0) timeout.get else -1
receiveTimeoutData = (timeoutMs, receiveTimeoutData._2)
}
var receiveTimeoutData: (Long, Cancellable) =
if (_receiveTimeout.isDefined) (_receiveTimeout.get, emptyCancellable) else emptyReceiveTimeoutData