From da2a23f3e9ecece746ec622ddc376c4138ab51ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= Date: Thu, 18 Apr 2013 16:19:41 +0200 Subject: [PATCH] Fixed compile errors --- .../scala/akka/remote/transport/AkkaProtocolTransport.scala | 4 ++-- akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala index 471ec5702c..7c88b09e61 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala @@ -115,7 +115,7 @@ private[transport] class AkkaProtocolManager( val stateActorSettings = settings val failureDetector = createTransportFailureDetector() context.actorOf(Props(new ProtocolStateActor( - HandshakeInfo(stateActorLocalAddress, RARP(context.system).provider.addressUid, stateActorSettings.SecureCookie), + HandshakeInfo(stateActorLocalAddress, AddressUidExtension(context.system).addressUid, stateActorSettings.SecureCookie), handle, stateActorAssociationHandler, stateActorSettings, @@ -128,7 +128,7 @@ private[transport] class AkkaProtocolManager( val stateActorWrappedTransport = wrappedTransport val failureDetector = createTransportFailureDetector() context.actorOf(Props(new ProtocolStateActor( - HandshakeInfo(stateActorLocalAddress, RARP(context.system).provider.addressUid, stateActorSettings.SecureCookie), + HandshakeInfo(stateActorLocalAddress, AddressUidExtension(context.system).addressUid, stateActorSettings.SecureCookie), remoteAddress, statusPromise, stateActorWrappedTransport, diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala index bcf62c431e..1281e7c80a 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala @@ -64,10 +64,6 @@ class RemoteConfigSpec extends AkkaSpec( val settings = new AkkaProtocolSettings(RARP(system).provider.remoteSettings.config) import settings._ - WaitActivityEnabled must be(true) - FailureDetectorImplementationClass must be(classOf[PhiAccrualFailureDetector].getName) - AcceptableHeartBeatPause must be === 3.seconds - HeartBeatInterval must be === 1.seconds RequireCookie must be(false) SecureCookie must be === None