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

Resolve merge conflict with master

Browse source
This commit is contained in:
Viktor Klang 2011-09-19 19:00:58 +02:00
commit f9e23c3102
98 changed files with 480 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-tutorials/akka-tutorial-first/src/main/java/akka/tutorial/first/java/Pi.java
View file

@ -78,7 +78,7 @@ public class Pi {
double result = calculatePiFor(work.getStart(), work.getNrOfElements());
// reply with the result
getContext().reply(new Result(result));
reply(new Result(result));
} else throw new IllegalArgumentException("Unknown message [" + message + "]");
}
@ -118,7 +118,7 @@ public class Pi {
if (message instanceof Calculate) {
// schedule work
for (int start = 0; start < nrOfMessages; start++) {
router.tell(new Work(start, nrOfElements), getContext());
router.tell(new Work(start, nrOfElements), getSelf());
}
// send a PoisonPill to all workers telling them to shut down themselves
@ -133,7 +133,7 @@ public class Pi {
Result result = (Result) message;
pi += result.getValue();
nrOfResults += 1;
if (nrOfResults == nrOfMessages) getContext().stop();
if (nrOfResults == nrOfMessages) getSelf().stop();
} else throw new IllegalArgumentException("Unknown message [" + message + "]");
}

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

@ -40,7 +40,7 @@ object Pi extends App {
def receive = {
case Work(start, nrOfElements) ⇒
self reply Result(calculatePiFor(start, nrOfElements)) // perform the work
reply(Result(calculatePiFor(start, nrOfElements))) // perform the work
}
}