From eb2cf56467a0f5da229da73ae76caf627cb1ed07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bone=CC=81r?= <jonas@jonasboner.com>
Date: Tue, 30 Aug 2011 18:41:47 +0200
Subject: [PATCH] Fixed toString and hashCode in config element. Fixing
 DeploymentSpec.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
---
 .../scala/akka/actor/actor/DeployerSpec.scala     |  2 +-
 .../main/scala/akka/actor/DeploymentConfig.scala  | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/actor/actor/DeployerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/actor/DeployerSpec.scala
index f79a0fef88..cf432a0900 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/actor/DeployerSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/actor/DeployerSpec.scala
@@ -21,7 +21,7 @@ class DeployerSpec extends WordSpec with MustMatchers {
           None,
           LeastCPU,
           Clustered(
-            Vector(Node("node1")),
+            List(Node("node1")),
             new ReplicationFactor(3),
             Replication(
               TransactionLog,
diff --git a/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala b/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
index 81c56d40f7..63a0c5f763 100644
--- a/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
+++ b/akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
@@ -93,12 +93,19 @@ object DeploymentConfig {
   // --- Replicas
   // --------------------------------
 
-  object ReplicationFactor {
-    def apply(factor: Int) = new ReplicationFactor(factor)
-  }
   class ReplicationFactor(val factor: Int) extends Serializable {
     if (factor < 0) throw new IllegalArgumentException("replication-factor can not be negative")
-    def toString = "ReplicationFactor(" + factor +")"
+    override def hashCode = 0 + factor.##
+    override def equals(other: Any) = ReplicationFactor.unapply(this) == ReplicationFactor.unapply(other)
+    override def toString = "ReplicationFactor(" + factor + ")"
+  }
+
+  object ReplicationFactor {
+    def apply(factor: Int): ReplicationFactor = new ReplicationFactor(factor)
+    def unapply(other: Any) = other match {
+      case x: ReplicationFactor ⇒ import x._; Some(factor)
+      case _                    ⇒ None
+    }
   }
 
   // For Java API