Commit graph

169 commits

Author SHA1 Message Date
Viktor Klang
c7d58c600b Adding initial support for Props 2011-08-26 17:25:18 +02:00
Roland
2d1a54a50d Merge forward-ports from branch 'release-1.2' 2011-08-14 23:48:33 +02:00
Peter Veentjer
1c39ed1ad6 cleanup of unused imports 2011-08-13 08:27:10 +03:00
Viktor Klang
37a6844d46 Changing default connection timeout to 100 seconds and adding Future Java API with tests 2011-08-12 17:26:26 +02:00
Roland
cdae21e07c restore behavior of Future.as[T] and .asSilently[T] (fixes #1088)
- implement both methods equivalently directly on Future
- remove implicit conversion futureToAnyOptionAsTypedOption
- update docs accordingly
2011-08-09 22:26:46 +02:00
Roland
deb7497038 Merge channel-cleanup into remote branch 'origin/master'
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/Future.scala
2011-08-09 22:05:29 +02:00
Viktor Klang
5c4488730f Fixing FutureTimeoutException so that it has a String constructor so it's deserializable in remoting 2011-08-08 15:38:22 +02:00
Derek Williams
0ae7a72f3a Future: Reschedule onTimeout/orElse if not yet expired 2011-08-06 14:10:36 -06:00
Derek Williams
bc1f7565b7 Fixed race in Future.await, and minor changes to Future.result and Future.exception 2011-08-06 13:32:03 -06:00
Viktor Klang
8a1d31691c Removing deprecated methods from Future and removing one of the bad guys _as_ 2011-08-06 20:44:49 +02:00
Viktor Klang
811e14e081 Fixing await so that it respects infinite timeouts 2011-08-06 20:05:43 +02:00
Viktor Klang
9fb91e92c9 Removing awaitBlocking from Future since Futures cannot be completed after timed out, also cleaning up a lot of code to use pattern matching instead of if/else while simplifying and avoiding allocations 2011-08-06 18:49:50 +02:00
Viktor Klang
458724de34 Reimplementing DefaultCompletableFuture to be as non-blocking internally as possible 2011-08-06 14:19:42 +02:00
Derek Williams
c6bdd33d9e Future: make callback stack usable outside of DefaultPromise, make Future.flow use callback stack, hide java api from Scala 2011-08-05 08:55:36 -06:00
Derek Williams
d378818414 Use dispatcher from the passed in Future 2011-08-03 10:11:24 -06:00
Viktor Klang
814eb1e321 Merge branch 'master' of github.com:jboner/akka 2011-08-03 14:26:26 +02:00
Viktor Klang
a589238f9c Set PartialFunction[T,Unit] as onResult callback, closing ticket #1077 2011-08-03 14:26:01 +02:00
Derek Williams
00494cf95d Fix for error while generating scaladocs 2011-08-02 13:38:02 -06:00
Derek Williams
fbbeacc1e4 Allow a Duration to be used with Future.apply 2011-08-02 13:01:10 -06:00
Derek Williams
8db226f663 Merge branch 'master' into derekjw-1054
Conflicts:
	akka-actor-tests/src/test/scala/akka/dispatch/FutureSpec.scala
2011-08-02 11:21:48 -06:00
Derek Williams
a0350d03e9 Future: move implicit dispatcher from methods to constructor 2011-08-02 10:19:49 -06:00
Roland
a43418a4c3 clean up Channel API (fixes #1070)
- remove feature query methods
- encode information in marker traits
- remove safe_!
- rename tellSafe to tryTell (harmonize with ActorRef.reply)
2011-08-01 21:38:28 +02:00
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
0ea10b96b9 Formatting fix 2011-07-28 10:34:08 -06:00
Derek Williams
04ba991b63 KeptPromise executes callbacks async 2011-07-28 10:10:41 -06:00
Derek Williams
cd41daf589 Future.onComplete now uses threadlocal callback stack to reduce amount of tasks sent to dispatcher 2011-07-28 09:57:45 -06:00
Derek Williams
5cb459c250 reverting optimized Future methods due to more consistent behavior and performance increase was small 2011-07-27 22:20:02 -06:00
Derek Williams
da987138dd Partial fix for ticket #1054: execute callbacks in dispatcher 2011-07-26 22:23:16 -06: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