From b209e1ca6a7d20234332d02568d54061bc944e8a Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 7 Mar 2010 23:45:25 +0100
Subject: [PATCH] Cleanup of onLoad

---
 .../src/main/scala/remote/BootableRemoteActorService.scala   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/akka-core/src/main/scala/remote/BootableRemoteActorService.scala b/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
index e200db9619..e8c7af612f 100644
--- a/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
+++ b/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
@@ -23,8 +23,8 @@ trait BootableRemoteActorService extends Bootable with Logging {
   def startRemoteService = remoteServerThread.start
   
   abstract override def onLoad   = {
+    super.onLoad //Initialize BootableActorLoaderService before remote service
     if(config.getBool("akka.remote.server.service", true)){
-      super.onLoad //Initialize BootableActorLoaderService before remote service
       
       if(config.getBool("akka.remote.cluster.service", true))
         Cluster.start(self.applicationLoader)
@@ -33,9 +33,6 @@ trait BootableRemoteActorService extends Bootable with Logging {
       startRemoteService
       log.info("Remote Actors Service initialized!")
     }
-    else
-      super.onLoad
-
   }
 
   abstract override def onUnload = {