From 6d6ceda28641eca3c1f2e1d262a9c7ec60a053e7 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Wed, 27 Jan 2010 01:32:27 +0100
Subject: [PATCH] Created BasicClusterActor

---
 .../src/main/scala/JGroupsClusterActor.scala             | 2 +-
 .../src/main/scala/ShoalClusterActor.scala               | 2 +-
 akka-core/src/main/scala/remote/Cluster.scala            | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/akka-cluster/akka-cluster-jgroups/src/main/scala/JGroupsClusterActor.scala b/akka-cluster/akka-cluster-jgroups/src/main/scala/JGroupsClusterActor.scala
index 2950fc3334..5688bcedcf 100644
--- a/akka-cluster/akka-cluster-jgroups/src/main/scala/JGroupsClusterActor.scala
+++ b/akka-cluster/akka-cluster-jgroups/src/main/scala/JGroupsClusterActor.scala
@@ -5,7 +5,7 @@ import org.jgroups.{JChannel, View => JG_VIEW, Address, Message => JG_MSG, Exten
 /**
  * Clustering support via JGroups.
  */
-class JGroupsClusterActor extends ClusterActor {
+class JGroupsClusterActor extends BasicClusterActor {
   import ClusterActor._
   import org.scala_tools.javautils.Imports._
 
diff --git a/akka-cluster/akka-cluster-shoal/src/main/scala/ShoalClusterActor.scala b/akka-cluster/akka-cluster-shoal/src/main/scala/ShoalClusterActor.scala
index bce3687597..dfca1e8f20 100644
--- a/akka-cluster/akka-cluster-shoal/src/main/scala/ShoalClusterActor.scala
+++ b/akka-cluster/akka-cluster-shoal/src/main/scala/ShoalClusterActor.scala
@@ -23,7 +23,7 @@ import com.sun.enterprise.ee.cms.impl.client.{FailureNotificationActionFactoryIm
                                        PlannedShutdownActionFactoryImpl
 }
 
-class ShoalClusterActor extends ClusterActor {
+class ShoalClusterActor extends BasicClusterActor {
 
   type ADDR_T = String
 
diff --git a/akka-core/src/main/scala/remote/Cluster.scala b/akka-core/src/main/scala/remote/Cluster.scala
index bd7b8ae1d1..970d36bd00 100644
--- a/akka-core/src/main/scala/remote/Cluster.scala
+++ b/akka-core/src/main/scala/remote/Cluster.scala
@@ -28,6 +28,10 @@ trait Cluster {
   def lookup[T](pf: PartialFunction[RemoteAddress, T]): Option[T]
 }
 
+trait ClusterActor extends Actor with Cluster {
+  val name = config.getString("akka.remote.cluster.name") getOrElse "default"     
+}
+
 private[remote] object ClusterActor {
   sealed trait ClusterMessage
 
@@ -39,7 +43,7 @@ private[remote] object ClusterActor {
 /**
  * Base class for cluster actor implementations.
  */
-abstract class ClusterActor extends Actor with Cluster {
+abstract class BasicClusterActor extends ClusterActor {
   import ClusterActor._
 
   case class Message(sender : ADDR_T,msg : Array[Byte])
@@ -55,12 +59,9 @@ abstract class ClusterActor extends Actor with Cluster {
   type ADDR_T
 
 
-
   @volatile private var local: Node = Node(Nil)
   @volatile private var remotes: Map[ADDR_T, Node] = Map()
 
-  val name = config.getString("akka.remote.cluster.name") getOrElse "default"
-
   override def init = {
       remotes = new HashMap[ADDR_T, Node]
   }