Commit graph

293 commits

Author SHA1 Message Date
Viktor Klang
73fce52235 Fixing returns to return in ScalaDoc 2012-02-06 16:59:09 +01:00
Viktor Klang
fac0d2e509 Improving the imports of Future 2012-02-06 12:48:03 +01:00
Viktor Klang
a607fbd517 Adding type parameter to onComplete for better type inference. Making complete throw exception on race. Minor code improvements inside Future 2012-02-06 12:10:37 +01:00
Viktor Klang
3267ce51a0 Merge branch 'master' of github.com:jboner/akka 2012-02-03 15:00:38 +01:00
patriknw
370e2d9818 Merge pull request #282 from jboner/wip-1310-err2-patriknw
Second stab at revised error handling. See #1310
2012-02-03 05:07:06 -08:00
Viktor Klang
22530b51e0 Adding more Scaladoc to Await and Awaitable 2012-02-03 13:59:38 +01:00
Patrik Nordwall
09e13e271b Merge branch 'master' into wip-1310-err2-patriknw
Conflicts:
	akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala
	akka-cluster/src/main/scala/akka/cluster/Cluster.scala
	akka-cluster/src/main/scala/akka/cluster/TransactionLog.scala
	akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
2012-02-03 13:57:28 +01:00
Viktor Klang
fc144cf204 ScalaDoc can be stupid 2012-02-03 13:49:07 +01:00
Patrik Nordwall
eb4fc53051 Added cause to LogEventException and ajdusted logging in Future. See #1310 2012-02-03 11:15:42 +01:00
Patrik Nordwall
44b5ff056a Added reportFailure for logging in ExecutionContext. See #1310 2012-02-03 10:37:31 +01:00
Viktor Klang
8193e61aee Renaming tryRecover to recoverWith as in SIP14, adding parameter to foreach 2012-02-03 09:25:56 +01:00
Patrik Nordwall
5033647176 Fixed things from review. See #1310 2012-02-01 17:38:12 +01:00
Patrik Nordwall
c447f46224 Some polish on the error handling. See #1310 2012-02-01 14:40:12 +01:00
Viktor Klang
815245a133 Merging with master 2012-01-31 17:56:49 +01:00
Viktor Klang
92426a82d9 Renaming Future.or to fallbackTo 2012-01-31 17:19:38 +01:00
Patrik Nordwall
f13b5356f7 Second stab at revised error handling. See #1310 2012-01-31 14:44:14 +01:00
Viktor Klang
1a5e7590ea Adding tests for tryRecover and andThen 2012-01-30 17:32:24 +01:00
Viktor Klang
5d2669769f Making the ExecutionContext protected and adding tryRecover 2012-01-30 17:01:47 +01:00
Viktor Klang
1ebdcaca1a Fixes after review 2012-01-26 17:47:31 +01:00
Viktor Klang
5ddf1afb20 Adding tests for recover and mapTo, adding API for creating manifests from Java and doccing things 2012-01-26 15:11:49 +01:00
Viktor Klang
99bf0aa87f Merge with master 2012-01-26 14:16:24 +01:00
Viktor Klang
b310407334 wip 2012-01-26 14:15:25 +01:00
Viktor Klang
5f83340d5e wip 2012-01-25 22:36:03 +01:00
Viktor Klang
9de08bb4ce Review comments addressed 2012-01-25 16:23:06 +01:00
Viktor Klang
f7a45c0e8f Removing dead imports from akka-actor 2012-01-25 15:38:04 +01:00
Peter Vlugter
ae79194118 Fix scaladoc @returns warnings (use @return) 2012-01-24 12:35:32 +13:00
Viktor Klang
dd3a6ad4a5 Unborking master, sorry about that. I blame my agent. 2012-01-23 11:39:16 +01:00
Viktor Klang
f8186e53d7 Merging in master 2012-01-23 11:30:36 +01:00
Viktor Klang
651a426de0 weird star replacement 2012-01-23 11:21:02 +01:00
viktorklang
6cb1914b5c Update akka-actor/src/main/scala/akka/dispatch/Future.scala 2012-01-22 23:11:09 +01:00
Viktor Klang
2e40cdcf0e Merge branch 'master' of github.com:jboner/akka 2012-01-19 18:21:25 +01:00
Viktor Klang
149fbea5a7 Updating Copyright as per #1660 2012-01-19 18:21:06 +01:00
viktorklang
b82ded6310 Merge pull request #227 from jboner/wip-1686-future-improvements-√
Removed FState, switched to isCompleted checks instead of value.isDefine...
2012-01-19 09:16:30 -08:00
Viktor Klang
cc1a22c902 Fixing signature of Futures.reduce 2012-01-19 17:41:53 +01:00
Viktor Klang
44c7f49f92 Removed FState, switched to isCompleted checks instead of value.isDefined, added zip etc 2012-01-19 13:50:02 +01:00
Viktor Klang
1714279eac Switching to reduceLeft so we can change the type signature of reduce to be more useful 2012-01-18 22:01:44 +01:00
Viktor Klang
24a6a66ca0 Making sure that if the second Future fails, the returned future also fails 2012-01-17 15:31:59 +01:00
Viktor Klang
fc0eb1de27 Changing the semantics of Future.or 2012-01-17 14:23:02 +01:00
Viktor Klang
7b60976227 Fixing glitch discovered by Derek 2012-01-17 08:59:57 +01:00
Viktor Klang
98c4febac8 Clarified Future.or semantics 2012-01-17 01:29:24 +01:00
Viktor Klang
1f4954755d Fixing ticket #1650 2012-01-17 01:18:57 +01:00
Viktor Klang
1756b6aa54 FIXMEs, young grasshopper 2012-01-16 20:18:08 +01:00
Roland
d0498eb32e add Class[_] to LogEvent
- it is customary to use class name for categorizing logs, hence we
  should support it; class is taken from logSource.getClass
- update SLF4J module to use logClass as category and set logSource in
  MDC "akkaSource"
- add docs
2012-01-12 13:29:17 +01:00
Viktor Klang
bd71ebb948 #1604 - Switched to ThreadLocal.remove() and dropping Optionizing things 2012-01-06 23:47:50 +01:00
Viktor Klang
8852128b93 #1598 - tryComplete == false for KeptPromise 2012-01-06 23:16:59 +01:00
Derek Williams
e8f16952a6 Avoid allocating varargs array and stack builder 2011-12-31 09:18:01 -07:00
Viktor Klang
1dc981725d Catching up with master 2011-12-30 19:06:16 +01:00
Viktor Klang
0e941d7646 Adding some more ScalaDoc to Future to explain foreach, withFilter and filter 2011-12-30 18:11:32 +01:00
Viktor Klang
4c7d9cbc1e Formatting Future.scala 2011-12-30 15:04:59 +01:00
Viktor Klang
f22f229619 Removing all but 2 uses of dispatcher.eventStream in Future.scala
this means we can look into requiring an ExecutionContext instead of MessageDispatcher
2011-12-30 14:15:27 +01:00