diff --git a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala index 3aa3818de7..bfbb8529be 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala @@ -24,6 +24,7 @@ sealed trait RemoteLifeCycleEvent extends Serializable { */ trait RemoteClientLifeCycleEvent extends RemoteLifeCycleEvent { def remoteAddress: Address + final def getRemoteAddress: Address = remoteAddress } /** @@ -31,8 +32,8 @@ trait RemoteClientLifeCycleEvent extends RemoteLifeCycleEvent { */ case class RemoteClientError( @BeanProperty cause: Throwable, - @transient @BeanProperty remote: RemoteTransport, - @BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { + @transient remote: RemoteTransport, + remoteAddress: Address) extends RemoteClientLifeCycleEvent { override def logLevel: Logging.LogLevel = Logging.ErrorLevel override def toString: String = "RemoteClientError@" + remoteAddress + ": Error[" + Logging.stackTraceFor(cause) + "]" } @@ -42,7 +43,7 @@ case class RemoteClientError( */ case class RemoteClientDisconnected( @transient @BeanProperty remote: RemoteTransport, - @BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { + remoteAddress: Address) extends RemoteClientLifeCycleEvent { override def logLevel: Logging.LogLevel = Logging.DebugLevel override def toString: String = "RemoteClientDisconnected@" + remoteAddress } @@ -52,7 +53,7 @@ case class RemoteClientDisconnected( */ case class RemoteClientConnected( @transient @BeanProperty remote: RemoteTransport, - @BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { + remoteAddress: Address) extends RemoteClientLifeCycleEvent { override def logLevel: Logging.LogLevel = Logging.DebugLevel override def toString: String = "RemoteClientConnected@" + remoteAddress } @@ -62,7 +63,7 @@ case class RemoteClientConnected( */ case class RemoteClientStarted( @transient @BeanProperty remote: RemoteTransport, - @BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { + remoteAddress: Address) extends RemoteClientLifeCycleEvent { override def logLevel: Logging.LogLevel = Logging.InfoLevel override def toString: String = "RemoteClientStarted@" + remoteAddress } @@ -72,7 +73,7 @@ case class RemoteClientStarted( */ case class RemoteClientShutdown( @transient @BeanProperty remote: RemoteTransport, - @BeanProperty remoteAddress: Address) extends RemoteClientLifeCycleEvent { + remoteAddress: Address) extends RemoteClientLifeCycleEvent { override def logLevel: Logging.LogLevel = Logging.InfoLevel override def toString: String = "RemoteClientShutdown@" + remoteAddress } diff --git a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala index d5d9370a2f..3226b874a1 100644 --- a/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala +++ b/akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala @@ -18,8 +18,8 @@ class ConcurrentSocketActorSpec extends AkkaSpec { def checkZeroMQInstallation = try { zmq.version match { - case ZeroMQVersion(2, 1, _) ⇒ Unit - case version ⇒ invalidZeroMQVersion(version) + case ZeroMQVersion(x, y, _) if x >= 3 || (x >= 2 && y >= 1) ⇒ Unit + case version ⇒ invalidZeroMQVersion(version) } } catch { case e: LinkageError ⇒ zeroMQNotInstalled