From 935d995617c574bfe841173d2832034568469b3f Mon Sep 17 00:00:00 2001
From: jfrijters <jfrijters>
Date: Sat, 23 Feb 2013 08:04:42 +0000
Subject: [PATCH] Regression fix. The previous Java class loader construction
 rewrite introduced a bug. We should re-check the javaClassLoader field while
 we hold the lock.

---
 runtime/AssemblyClassLoader.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/runtime/AssemblyClassLoader.cs b/runtime/AssemblyClassLoader.cs
index b4580e44..8bd5d8e1 100644
--- a/runtime/AssemblyClassLoader.cs
+++ b/runtime/AssemblyClassLoader.cs
@@ -946,7 +946,10 @@ namespace IKVM.Internal
 					curr.recursion++;
 					try
 					{
-						InitializeJavaClassLoader(curr, customClassLoader);
+						if (javaClassLoader == null)
+						{
+							InitializeJavaClassLoader(curr, customClassLoader);
+						}
 					}
 					finally
 					{