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

Merge branch 'master' of github.com:jboner/akka

Browse source 
Conflicts:
	akka-actor/src/main/scala/akka/actor/Actor.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-actor/src/main/scala/akka/actor/TypedActor.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
	akka-cluster/src/main/scala/akka/cluster/ReplicatedClusterRef.scala
	akka-durable-mailboxes/akka-mailboxes-common/src/main/scala/akka/actor/mailbox/DurableDispatcher.scala
	akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala
	akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
This commit is contained in:
Roland 2011-06-14 00:19:54 +02:00
commit ca592ef1b4
89 changed files with 7842 additions and 2929 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-tutorials/akka-tutorial-second/src/main/java/akka/tutorial/java/second/Pi.java
View file

@ -184,7 +184,7 @@ public class Pi {
// send calculate message
long timeout = 60000;
Future<Object> replyFuture = master.sendRequestReplyFuture(new Calculate(), timeout, null);
Future<Object> replyFuture = master.ask(new Calculate(), timeout, null);
Option<Object> result = replyFuture.await().resultOrException();
if (result.isDefined()) {
double pi = (Double) result.get();

2
akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
View file

@ -104,7 +104,7 @@ object Pi extends App {
val start = now
//send calculate message
master.!!![Double](Calculate, timeout = 60000).
master.?(Calculate)(timeout = Actor.Timeout(60000)).
await.resultOrException match {//wait for the result, with a 60 seconds timeout
case Some(pi) =>
EventHandler.info(this, "\n\tPi estimate: \t\t%s\n\tCalculation time: \t%s millis".format(pi, (now - start)))