+clu #15365 Make cluster.UniqueAddress public

(cherry picked from commit 2a2caeebd585d6dde53bbca0125e62626f7bae51)

Conflicts:
	akka-cluster/src/main/scala/akka/cluster/Member.scala
This commit is contained in:
Patrik Nordwall 2014-06-05 13:25:42 +02:00
parent 5f3d6029b1
commit 4e9592b4db
2 changed files with 9 additions and 6 deletions

View file

@ -69,9 +69,11 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
import InfoLogger._
/**
* INTERNAL API
* The address including a `uid` of this cluster member.
* The `uid` is needed to be able to distinguish different
* incarnations of a member with same hostname and port.
*/
private[cluster] val selfUniqueAddress: UniqueAddress = system.provider match {
val selfUniqueAddress: UniqueAddress = system.provider match {
case c: ClusterActorRefProvider
UniqueAddress(c.transport.defaultAddress, AddressUidExtension(system).addressUid)
case other throw new ConfigurationException(

View file

@ -19,8 +19,7 @@ import MemberStatus._
*/
@SerialVersionUID(1L)
class Member private[cluster] (
/** INTERNAL API **/
private[cluster] val uniqueAddress: UniqueAddress,
val uniqueAddress: UniqueAddress,
/** INTERNAL API **/
private[cluster] val upNumber: Int,
val status: MemberStatus,
@ -216,10 +215,12 @@ object MemberStatus {
}
/**
* INTERNAL API
* Member identifier consisting of address and random `uid`.
* The `uid` is needed to be able to distinguish different
* incarnations of a member with same hostname and port.
*/
@SerialVersionUID(1L)
private[cluster] final case class UniqueAddress(address: Address, uid: Int) extends Ordered[UniqueAddress] {
final case class UniqueAddress(address: Address, uid: Int) extends Ordered[UniqueAddress] {
override def hashCode = uid
def compare(that: UniqueAddress): Int = {