From 34915063cda510ba06baba744af1c3ee2bfcaf22 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 25 May 2012 12:51:37 +0200 Subject: [PATCH] Correct sort. See #2133 --- akka-cluster/src/main/scala/akka/cluster/Cluster.scala | 8 ++++---- akka-cluster/src/test/scala/akka/cluster/MemberSpec.scala | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala index 55f9967596..259f487358 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala @@ -101,10 +101,10 @@ object Member { import MemberStatus._ implicit val addressOrdering: Ordering[Address] = Ordering.fromLessThan[Address] { (a, b) ⇒ - if (a.protocol < b.protocol) true - else if (a.system < b.system) true - else if (a.host.getOrElse("") < b.host.getOrElse("")) true - else if (a.port.getOrElse(0) < b.port.getOrElse(0)) true + if (a.protocol != b.protocol) a.protocol.compareTo(b.protocol) < 0 + else if (a.system != b.system) a.system.compareTo(b.system) < 0 + else if (a.host.getOrElse("") != b.host.getOrElse("")) a.host.getOrElse("").compareTo(b.host.getOrElse("")) < 0 + else if (a.port.getOrElse(0) != b.port.getOrElse(0)) a.port.getOrElse(0) < b.port.getOrElse(0) else false } diff --git a/akka-cluster/src/test/scala/akka/cluster/MemberSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MemberSpec.scala index a75ead0149..ba1037b8bc 100644 --- a/akka-cluster/src/test/scala/akka/cluster/MemberSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/MemberSpec.scala @@ -21,8 +21,9 @@ class MemberSpec extends WordSpec with MustMatchers { val m3 = Member(Address("cluster", "sys1", "host1", 10000), MemberStatus.Up) val m4 = Member(Address("cluster", "sys1", "host2", 10000), MemberStatus.Up) val m5 = Member(Address("cluster", "sys2", "host2", 10000), MemberStatus.Up) + val m6 = Member(Address("cluster", "sys2", "host3", 8000), MemberStatus.Up) - val expected = IndexedSeq(m1, m2, m3, m4, m5) + val expected = IndexedSeq(m1, m2, m3, m4, m5, m6) val shuffled = Random.shuffle(expected) shuffled.sorted must be(expected) }