Merge branch 'master' into derekjw-future-dispatch

2011-03-07 18:57:08 -07:00 · 2011-03-07 18:57:08 -07:00 · eee9445be8
commit eee9445be8
parent ca24247b46 4901ad3b6d
17 changed files with 1968 additions and 1110 deletions
--- a/akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala
@ -141,7 +141,7 @@ class ExecutorBasedEventDrivenDispatcher(
          executorService.get() execute mbox
        } catch {
          case e: RejectedExecutionException =>
-            EventHandler notifyListeners EventHandler.Warning(e, this, _name)
+            EventHandler notifyListeners EventHandler.Warning(this, e.toString)
            mbox.dispatcherLock.unlock()
            throw e
        }