raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #1315 from akka/wip-remoting-terminated-exc-patriknw

Browse source 
Supress stack trace for exc thrown when remoting is stopped
This commit is contained in:
Patrik Nordwall 2013-04-09 00:11:46 -07:00
commit fe31aa1948
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-remote/src/main/scala/akka/remote/RemoteTransport.scala
View file

@ -9,6 +9,7 @@ import akka.actor._
import akka.event.LoggingAdapter
import scala.collection.immutable
import scala.concurrent.Future
import scala.util.control.NoStackTrace
/**
* RemoteTransportException represents a general failure within a RemoteTransport,
@ -17,6 +18,13 @@ import scala.concurrent.Future
@SerialVersionUID(1L)
class RemoteTransportException(message: String, cause: Throwable) extends AkkaException(message, cause)
/**
* [[RemoteTransportException]] without stack trace.
*/
@SerialVersionUID(1L)
class RemoteTransportExceptionNoStackTrace(message: String, cause: Throwable)
extends RemoteTransportException(message, cause) with NoStackTrace
/**
* INTERNAL API
*

4
akka-remote/src/main/scala/akka/remote/Remoting.scala
View file

@ -194,7 +194,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
override def send(message: Any, senderOption: Option[ActorRef], recipient: RemoteActorRef): Unit = endpointManager match {
case Some(manager) ⇒ manager.tell(Send(message, senderOption, recipient), sender = senderOption getOrElse Actor.noSender)
case None ⇒ throw new IllegalStateException("Attempted to send remote message but Remoting is not running.")
case None ⇒ throw new RemoteTransportExceptionNoStackTrace("Attempted to send remote message but Remoting is not running.", null)
}
override def managementCommand(cmd: Any): Future[Boolean] = endpointManager match {
@ -202,7 +202,7 @@ private[remote] class Remoting(_system: ExtendedActorSystem, _provider: RemoteAc
import system.dispatcher
implicit val timeout = CommandAckTimeout
manager ? ManagementCommand(cmd) map { case ManagementCommandAck(status) ⇒ status }
case None ⇒ throw new IllegalStateException("Attempted to send management command but Remoting is not running.")
case None ⇒ throw new RemoteTransportExceptionNoStackTrace("Attempted to send management command but Remoting is not running.", null)
}
// Not used anywhere only to keep compatibility with RemoteTransport interface