X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=ffba91a3e1a9346e4cd43154cdefba72b23738a5;hb=2c6cfdaa28c8108817155d724b87bbbfd0392c7c;hp=f0c2d90d1f99758a1adc4e9238afa93e3324c3f3;hpb=9b498d3407a628c8815d13f462962e2dd6c27b46;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
index f0c2d90d1..ffba91a3e 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
@@ -36,7 +36,8 @@ final class Kernel implements ServiceListener {
 	private final static Log log = LogFactory.getLog(Kernel.class);
 
 	private final BundleContext bundleContext;
-	private final ThreadGroup threadGroup = new ThreadGroup("Argeo CMS Kernel");
+	// private final ThreadGroup threadGroup = new
+	// ThreadGroup("Argeo CMS Kernel");
 
 	private JackrabbitNode node;
 	private RepositoryFactory repositoryFactory;
@@ -48,19 +49,22 @@ final class Kernel implements ServiceListener {
 	}
 
 	void init() {
-		new Thread(threadGroup, "init") {
-			@Override
-			public void run() {
-				// CMS bundle classloader used during initialisation
-				Thread.currentThread().setContextClassLoader(
-						Kernel.class.getClassLoader());
-				doInit();
-			}
-		}.start();
+		// new Thread(threadGroup, "init") {
+		// @Override
+		// public void run() {
+		// // CMS bundle classloader used during initialisation
+		// Thread.currentThread().setContextClassLoader(
+		// Kernel.class.getClassLoader());
+		doInit();
+		// }
+		// }.start();
 	}
 
-	/** Run asynchronously */
 	protected void doInit() {
+		ClassLoader currentContextCl = Thread.currentThread()
+				.getContextClassLoader();
+		Thread.currentThread().setContextClassLoader(
+				Kernel.class.getClassLoader());
 		long begin = System.currentTimeMillis();
 		InternalAuthentication initAuth = new InternalAuthentication(
 				KernelConstants.DEFAULT_SECURITY_KEY);
@@ -85,6 +89,8 @@ final class Kernel implements ServiceListener {
 		} catch (Exception e) {
 			log.error("Cannot initialize Argeo CMS", e);
 			throw new ArgeoException("Cannot initialize", e);
+		} finally {
+			Thread.currentThread().setContextClassLoader(currentContextCl);
 		}
 
 		long jvmUptime = ManagementFactory.getRuntimeMXBean().getUptime();