Commit graph

142 commits

Author SHA1 Message Date
Viktor Klang
29ca6a867b Making MessageDispatcher an abstract class, as well as ActorRef 2011-08-01 15:23:57 +02:00
Viktor Klang
088e2029a6 Minor cleanup in Future.scala 2011-08-01 12:52:18 +02:00
Viktor Klang
824d202b4a Refactor Future.await to remove boiler and make it correct in the face of infinity 2011-08-01 12:33:40 +02:00
Derek Williams
5b5d3cd892 Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
	akka-cluster/src/main/scala/akka/cluster/ClusterActorRef.scala
	akka-tutorials/akka-tutorial-second/src/main/scala/Pi.scala
	project/AkkaBuild.scala
2011-07-26 13:05:28 -06:00
Derek Williams
6d343b01f0 Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	akka-actor/src/main/scala/akka/actor/ActorRef.scala
2011-07-26 12:50:09 -06:00
Peter Vlugter
340ed11de5 Reformat with scalariform 2011-07-26 18:33:59 +12:00
Viktor Klang
3bc7db0dde Closing ticket #1030, removing lots of warnings 2011-07-19 19:28:46 +02:00
Derek Williams
50dcdd411c Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/misc/SchedulerSpec.scala
2011-07-15 11:31:24 -06:00
Viktor Klang
9d71be7778 Updating copyright section to Typesafe Inc. etc 2011-07-14 16:03:08 +02:00
Derek Williams
34ca784846 Merge branch 'master' into wip-derekjw
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
	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-actor/src/main/scala/akka/dispatch/Future.scala
2011-07-11 13:02:42 -06:00
Viktor Klang
24250d0da6 Changing 'flow' to use onException instead of other boilerplate 2011-07-11 14:51:23 +02:00
Viktor Klang
2b2fceaa6b Fixing ticket #997, unsafe publication corrected 2011-07-10 20:18:43 +02:00
Derek Williams
ccb8440912 Move Timeout into actor package to make more accessible, use overloaded '?' method to handle explicit Timeout 2011-06-28 15:20:31 -06:00
Derek Williams
1d710cc0a4 Make better use of implicit Timeouts, fixes problem with using KeptPromise with aggregate methods (like traverse and sequence) 2011-06-25 14:20:54 -06:00
Derek Williams
2abb768e85 formatting fix 2011-06-23 15:06:25 -06:00
Derek Williams
eab78b383d Add Future.orElse(x) to supply value if future expires 2011-06-20 16:22:46 -06:00
Derek Williams
b28b9ac4f0 Make it possible to use infinite timeout with Actors 2011-06-19 12:05:27 -06:00
Derek Williams
e639b2c74d Start migrating Future to use Actor.Timeout, including support for never timing out. More testing and optimization still needed 2011-06-18 23:23:47 -06:00
Derek Williams
bf2a8cdec6 Better solution to ticket #853, better performance for DefaultPromise if already completed, especially if performing chained callbacks 2011-06-18 20:13:13 -06:00
Derek Williams
9bd9a3544e Merge branch 'master' into wip-derekjw 2011-06-17 16:46:36 -06:00
Derek Williams
d71954c2fa Add Future.onTimeout 2011-06-17 06:51:40 -06:00
Viktor Klang
d2c80a4b54 Merge branch 'master' of github.com:jboner/akka 2011-06-17 09:54:56 +02:00
Viktor Klang
b5d3a67355 Adding some ScalaDoc to Future 2011-06-17 09:54:49 +02:00
viktorklang
a41737e197 Changed a typo 2011-06-16 08:08:31 -07:00
Derek Williams
1e0291ac98 Specialize mapTo for KeptPromise 2011-06-14 12:32:34 -06:00
Derek Williams
42ec626b67 Merge branch 'master' into promisestream
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/Future.scala
2011-06-14 12:27:20 -06:00
Jonas Bonér
26500bed09 1. Removed implicit scoped timeout in ? method.
Reason: 'pingPongActor.?(Ping)(timeout = TimeoutMillis)' breaks old user code and is so ugly. It is not worth it. Now user write (as he used to): 'pingPongActor ? (Ping, TimeoutMillis)'
2. Fixed broken Cluster communication
3. Added constructor with only String arg for UnhandledMessageException to allow client instantiation of remote exception

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
2011-06-14 14:26:13 +02:00
Derek Williams
e18cc7bac6 revert changes to java api 2011-06-13 22:31:06 -06:00
Derek Williams
cbdfd0fe23 Fix Future type issues 2011-06-13 20:25:31 -06:00
Roland
ca592ef1b4 Merge branch 'master' of github.com:jboner/akka
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
2011-06-14 00:19:54 +02:00
Roland
7712c20620 unify sender/senderFuture into channel (++)
(squashed merge from the various bits and pieces already part of
release-1.2, everything related to Channel & Future)
2011-06-13 22:36:46 +02:00
Viktor Klang
fa0478bc32 Replacing !!! with ? 2011-06-13 13:43:21 +02:00
Viktor Klang
f9d0b188af Removing ActorRef.isDefinedAt and Future.empty and moving Future.channel to Promise, renaming future to promise for the channel 2011-06-04 12:42:06 -07:00
Viktor Klang
b0952e5212 Renaming Future.failure to Future.recover 2011-06-02 13:33:49 -07:00
Viktor Klang
49883d8c59 Adding support for completing senderFutures when actor is stopped, closing ticket #894. Also renaming DurableEventBasedDispatcher to DurableDispatcher 2011-05-26 20:38:42 +02:00
Viktor Klang
e94b722a4b Adding withFilter to Future, fixing signature of filter, cleaning up foreach 2011-05-26 19:33:03 +02:00
Derek Williams
e1e89ceec2 Merge branch 'master' into promisestream
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/Future.scala
2011-05-23 20:42:11 -06:00
Viktor Klang
cf0970d277 Removing duplicate code for TypedActor 2011-05-23 11:54:41 +02:00
Viktor Klang
8a790b1ddf Renaming CompletableFuture to Promise, Renaming AlreadyCompletedFuture to KeptPromise, closing ticket #854 2011-05-23 11:31:01 +02:00
Derek Williams
e4b96b16aa Refactor for improved clarity and performance.
'Either' already uses pattern matching internally for all of it's methods,
and the 'right' and 'left' methods allocate an 'Option' which is now avoided.
2011-05-19 21:08:27 -06:00
Derek Williams
5b99014cba Refactor to avoid allocations 2011-05-19 17:23:19 -06:00
Derek Williams
634d26aa86 Add PromiseStream 2011-05-19 14:43:58 -06:00
Derek Williams
8058a5514a Specialize monadic methods for AlreadyCompletedFuture, fixes #853 2011-05-19 14:37:54 -06:00
Jonas Bonér
a7311c83e6 Added Scalariform sbt plugin which formats code on each compile. Also checking in reformatted code 2011-05-18 17:25:30 +02:00
Peter Veentjer
e7d1eaf15c - more style related cleanup 2011-05-18 08:37:58 +02:00
Jonas Bonér
2655d44ee9 Merged wip-2.0 branch with latest master 2011-05-16 12:32:00 +02:00
Viktor Klang
5b54de7f48 Changing signature of traverse and sequence to return java.lang.Iterable, updated docs as well, closing #847 2011-05-11 13:29:29 +02:00
Peter Vlugter
6f17d2cf6d Fix @deprecated warnings 2011-05-06 11:55:58 +12:00
Derek Williams
8752eb5452 Add Promise factory object for creating new CompletableFutures 2011-05-03 18:49:14 -06:00
Derek Williams
5b18f18ffd Fix bug with 'Future << x', must be used within a 'flow' block now 2011-05-03 18:49:14 -06:00