From 64cda1f3e75455c59f5e2cd4c2b397efb5fc730a Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 21 May 2012 20:21:12 +0200 Subject: [PATCH] Fixing AkkaException once and for all --- .../src/test/scala/akka/actor/dispatch/ActorModelSpec.scala | 4 ++-- akka-actor/src/main/scala/akka/AkkaException.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala index 854a562745..acc416f04f 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala @@ -408,9 +408,9 @@ abstract class ActorModelSpec(config: String) extends AkkaSpec(config) with Defa assert(Await.result(f1, timeout.duration) === "foo") assert(Await.result(f2, timeout.duration) === "bar") assert(Await.result(f4, timeout.duration) === "foo2") - assert(intercept[ActorInterruptedException](Await.result(f3, timeout.duration)).getMessage === "Ping!") + assert(intercept[ActorInterruptedException](Await.result(f3, timeout.duration)).getCause.getMessage === "Ping!") assert(Await.result(f6, timeout.duration) === "bar2") - assert(intercept[ActorInterruptedException](Await.result(f5, timeout.duration)).getMessage === "Ping!") + assert(intercept[ActorInterruptedException](Await.result(f5, timeout.duration)).getCause.getMessage === "Ping!") } } diff --git a/akka-actor/src/main/scala/akka/AkkaException.scala b/akka-actor/src/main/scala/akka/AkkaException.scala index 7c58972d8c..04e820419f 100644 --- a/akka-actor/src/main/scala/akka/AkkaException.scala +++ b/akka-actor/src/main/scala/akka/AkkaException.scala @@ -18,7 +18,7 @@ class AkkaException(message: String, cause: Throwable) extends RuntimeException( lazy val uuid: String = java.util.UUID.randomUUID().toString - override def getMessage(): String = "[" + uuid + "] " + super.getMessage + override def toString(): String = uuid + super.toString() } /**