merge master into parental-supervision, fixing up resulting breakage

2011-10-21 15:11:43 +02:00 · 2011-10-21 15:11:43 +02:00 · d55f02e6c1
commit d55f02e6c1
parent 3b698b9470 550ed58bf7
95 changed files with 759 additions and 731 deletions
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.scala
@ -42,7 +42,7 @@ object Props {
   */
  def apply(): Props = default

-  def empty = Props(context ⇒ { case null ⇒ })
+  val empty = Props(new Actor { def receive = Actor.emptyBehavior })

  /**
   * Returns a Props that has default values except for "creator" which will be a function that creates an instance