Merge pull request #1765 from akka/wip-3636-revert-join-uninitialized-patriknw

+clu #3636 Revert join to uninitialized

akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala

@@ -294,7 +294,6 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef) extends Actor with
     case InitJoin                          ⇒ sender ! InitJoinNack(selfAddress)
     case ClusterUserAction.JoinTo(address) ⇒ join(address)
     case JoinSeedNodes(seedNodes)          ⇒ joinSeedNodes(seedNodes)
-    case Join(node, roles)                 ⇒ joiningUninitialized(node, roles)
     case msg: SubscriptionMessage          ⇒ publisher forward msg
   }
 
@@ -307,7 +306,6 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef) extends Actor with
     case JoinSeedNodes(seedNodes) ⇒
       becomeUninitialized()
       joinSeedNodes(seedNodes)
-    case Join(node, roles)        ⇒ joiningUninitialized(node, roles)
     case msg: SubscriptionMessage ⇒ publisher forward msg
     case _: Tick ⇒
       if (deadline.exists(_.isOverdue)) {
@@ -476,16 +474,6 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef) extends Actor with
     }
   }
 
-  /**
-   * Another node is joining when this node is uninitialized.
-   */
-  def joiningUninitialized(node: UniqueAddress, roles: Set[String]): Unit = {
-    require(latestGossip.members.isEmpty, "Joining an uninitialized node can only be done from empty state")
-    joining(node, roles)
-    if (latestGossip.hasMember(selfUniqueAddress))
-      becomeInitialized()
-  }
-
   /**
    * Reply from Join request.
    */