diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala index 113fab5f32..4bc3a9dc31 100644 --- a/akka-core/src/main/scala/actor/Actor.scala +++ b/akka-core/src/main/scala/actor/Actor.scala @@ -151,29 +151,6 @@ object Actor extends Logging { def receive = body } - /** - * Use to create an anonymous event-driven remote actor. - *

- * The actor is created with a 'permanent' life-cycle configuration, which means that - * if the actor is supervised and dies it will be restarted. - *

- * The actor is started when created. - * Example: - *

-   * import Actor._
-   *
-   * val a = remoteActor("localhost", 9999) {
-   *   case msg => ... // handle message
-   * }
-   * 
- */ - def remoteActor(hostname: String, port: Int)(body: PartialFunction[Any, Unit]): Actor = new Actor() { - lifeCycle = Some(LifeCycle(Permanent)) - makeRemote(hostname, port) - start - def receive = body - } - /** * Use to create an anonymous event-driven actor with both an init block and a message loop block. *

@@ -543,6 +520,7 @@ trait Actor extends TransactionManagement with Logging { /** * Sends a message asynchronously and waits on a future for a reply message. + * Uses the time-out defined in the Actor. *

* It waits on the reply either until it receives it (in the form of Some(replyMessage)) * or until the timeout expires (which will return None). E.g. send-and-receive-eventually semantics.