From f94dc3f12e714b99b84a3ced1facc615d60825cb Mon Sep 17 00:00:00 2001
From: Eckart Hertzler <eckart@dilbert.(none)>
Date: Mon, 8 Mar 2010 15:31:36 +0100
Subject: [PATCH] fix classloader error when starting AKKA as a library in
 jetty (fixes http://www.assembla.com/spaces/akka/tickets/129 )

---
 .../src/main/scala/actor/BootableActorLoaderService.scala     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
index 60f6ec3781..b027dbcc3a 100644
--- a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
+++ b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
@@ -30,7 +30,7 @@ trait BootableActorLoaderService extends Bootable with Logging {
       }
       val toDeploy = for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL
       log.info("Deploying applications from [%s]: [%s]", DEPLOY, toDeploy.toArray.toList)
-      new URLClassLoader(toDeploy.toArray, ClassLoader.getSystemClassLoader)
+      new URLClassLoader(toDeploy.toArray, getClass.getClassLoader)
     } else getClass.getClassLoader)
   }
 
@@ -43,4 +43,4 @@ trait BootableActorLoaderService extends Bootable with Logging {
   }
   
   abstract override def onUnload = ActorRegistry.shutdownAll
-}
\ No newline at end of file
+}