From da84f03e460889504b737a3fa25954a187df7681 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 20 Dec 2012 13:40:36 +0100
Subject: [PATCH] =?UTF-8?q?=20#2841=20=E2=80=93=20remove=20stack=20traces?=
 =?UTF-8?q?=20from=20new=20remoting=20exceptions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/scala/akka/remote/testconductor/Conductor.scala   | 2 +-
 .../remote/transport/FailureInjectorTransportAdapter.scala     | 3 ++-
 .../akka/remote/transport/SwitchableLoggedBehaviorSpec.scala   | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
index edcc3e664a..31d05b8a71 100644
--- a/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
+++ b/akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala
@@ -349,7 +349,7 @@ private[akka] class ServerFSM(val controller: ActorRef, val channel: Channel) ex
  */
 private[akka] object Controller {
   case class ClientDisconnected(name: RoleName)
-  class ClientDisconnectedException(msg: String) extends AkkaException(msg)
+  class ClientDisconnectedException(msg: String) extends AkkaException(msg) with NoStackTrace
   case object GetNodes
   case object GetSockAddr
   case class CreateServerFSM(channel: Channel)
diff --git a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
index 0ad253e186..c122745536 100644
--- a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
+++ b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala
@@ -10,8 +10,9 @@ import akka.util.ByteString
 import java.util.concurrent.ConcurrentHashMap
 import scala.concurrent.forkjoin.ThreadLocalRandom
 import scala.concurrent.{ Future, Promise }
+import scala.util.control.NoStackTrace
 
-case class FailureInjectorException(msg: String) extends AkkaException(msg)
+case class FailureInjectorException(msg: String) extends AkkaException(msg) with NoStackTrace
 
 class FailureInjectorProvider extends TransportAdapterProvider {
 
diff --git a/akka-remote/src/test/scala/akka/remote/transport/SwitchableLoggedBehaviorSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/SwitchableLoggedBehaviorSpec.scala
index 54fb1194b2..0c130d9cd9 100644
--- a/akka-remote/src/test/scala/akka/remote/transport/SwitchableLoggedBehaviorSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/transport/SwitchableLoggedBehaviorSpec.scala
@@ -5,9 +5,10 @@ import akka.remote.transport.TestTransport.SwitchableLoggedBehavior
 import scala.concurrent.{ Await, Promise }
 import scala.util.Failure
 import akka.AkkaException
+import scala.util.control.NoStackTrace
 
 object SwitchableLoggedBehaviorSpec {
-  object TestException extends AkkaException("Test exception")
+  object TestException extends AkkaException("Test exception") with NoStackTrace
 }
 
 class SwitchableLoggedBehaviorSpec extends AkkaSpec with DefaultTimeout {