diff options
| author | jfrijters <jfrijters> | 2013-02-23 12:04:42 +0400 |
|---|---|---|
| committer | jfrijters <jfrijters> | 2013-02-23 12:04:42 +0400 |
| commit | 935d995617c574bfe841173d2832034568469b3f (patch) | |
| tree | f5daefd1fff7e80d16a2e836f85fb17231c787f8 | |
| parent | 2a192de1cb84e7ece8efb26bc38a488ae4e051ba (diff) | |
Regression fix. The previous Java class loader construction rewrite introduced a bug. We should re-check the javaClassLoader field while we hold the lock.
| -rw-r--r-- | runtime/AssemblyClassLoader.cs | 5 |
1 files changed, 4 insertions, 1 deletions
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 { |