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

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

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

@ -38,7 +38,7 @@ object Pi extends App {
def receive = {
case Work(arg, nrOfElements) ⇒
self reply Result(calculatePiFor(arg, nrOfElements)) // perform the work
reply(Result(calculatePiFor(arg, nrOfElements))) // perform the work
}
}
@ -62,7 +62,7 @@ object Pi extends App {
for (arg ← 0 until nrOfMessages) router ! Work(arg, nrOfElements)
//Assume the gathering behavior
this become gather(self.channel)
this become gather(channel)
}
// phase 2, aggregate the results of the Calculation