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

Merging in master, huge work trying to get things to compile, tests not green at this stage

Browse source
This commit is contained in:
Viktor Klang 2012-07-06 17:04:04 +02:00
commit ac5b5de90a
68 changed files with 3759 additions and 2144 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor-tests/src/test/java/akka/dispatch/JavaFutureTests.java
View file

@ -321,7 +321,7 @@ public class JavaFutureTests {
Future<Object> f = p.future().recoverWith(new Recover<Future<Object>>() {
public Future<Object> recover(Throwable t) throws Throwable {
if (t == fail)
return Futures.<Object> successful("foo", system.dispatcher()).future();
return Futures.<Object> successful("foo", system.dispatcher());
else
throw t;
}