[misc] Bulletproofing

(cherry picked from commit 9006f01)
xwiki · Feb 27, 2015 · 55b3d4d · 55b3d4d
1 parent de14bf6
commit 55b3d4d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...va/org/xwiki/classloader/xwiki/internal/ThreadClassloaderExecutionContextInitializer.java b/...va/org/xwiki/classloader/xwiki/internal/ThreadClassloaderExecutionContextInitializer.java
@@ -56,7 +56,9 @@ public class ThreadClassloaderExecutionContextInitializer implements ExecutionCo
     @Override
     public void initialize(ExecutionContext context) throws ExecutionContextException
     {
-        Thread.currentThread().setContextClassLoader(
-            new ContextNamespaceURLClassLoader(currentWikiProvider, this.classLoaderManager));
+        if (!(Thread.currentThread().getContextClassLoader() instanceof ContextNamespaceURLClassLoader)) {
+            Thread.currentThread().setContextClassLoader(
+                new ContextNamespaceURLClassLoader(currentWikiProvider, this.classLoaderManager));
+        }
     }
 }