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

properly fix the port==0 issue and use it in more tests

Browse source 
- add documentation to RemoteTransport interface what is expected wrt.
  address’ availability before, during and after start()
This commit is contained in:
Roland 2012-01-27 15:21:05 +01:00
parent ac1ee9ae91
commit 4482f14650
6 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
View file

@ -4,6 +4,8 @@
package akka.remote.netty
import java.net.InetSocketAddress
import java.util.concurrent.atomic.AtomicReference
import java.util.concurrent.atomic.AtomicBoolean
import java.util.concurrent.locks.ReentrantReadWriteLock
import java.util.concurrent.Executors
@ -21,7 +23,7 @@ import akka.actor.{ Address, ActorSystemImpl, ActorRef }
import akka.dispatch.MonitorableThreadFactory
import akka.event.Logging
import akka.remote.RemoteProtocol.AkkaRemoteProtocol
import akka.remote.{ RemoteTransport, RemoteSettings, RemoteMarshallingOps, RemoteActorRefProvider, RemoteActorRef }
import akka.remote.{ RemoteTransportException, RemoteTransport, RemoteSettings, RemoteMarshallingOps, RemoteActorRefProvider, RemoteActorRef }
/**
* Provides the implementation of the Netty remote support
@ -55,11 +57,24 @@ class NettyRemoteTransport(val remoteSettings: RemoteSettings, val system: Actor
case ex ⇒ shutdown(); throw ex
}
val address = Address("akka", remoteSettings.systemName, Some(settings.Hostname), Some(settings.Port))
// the address is set in start() or from the RemoteServerHandler, whichever comes first
private val _address = new AtomicReference[Address]
private[akka] def setAddressFromChannel(ch: Channel) = {
val addr = ch.getLocalAddress match {
case sa: InetSocketAddress ⇒ sa
case x ⇒ throw new RemoteTransportException("unknown local address type " + x.getClass, null)
}
_address.compareAndSet(null, Address("akka", remoteSettings.systemName, Some(settings.Hostname), Some(addr.getPort)))
}
def address = _address.get
val log = Logging(system.eventStream, "NettyRemoteTransport(" + address + ")")
def start(): Unit = server.start()
def start(): Unit = {
server.start()
setAddressFromChannel(server.channel)
}
def shutdown(): Unit = {
clientsLock.writeLock().lock()