From 6d381ee6fe794f58e05e67963ec9c931dd34e1c8 Mon Sep 17 00:00:00 2001
From: jfrijters <jfrijters>
Date: Sun, 19 Jun 2011 10:17:19 +0000
Subject: Unforked sun.misc.Launcher. Use (more) map.xml patching instead.

---
 openjdk/map.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'openjdk/map.xml')

diff --git a/openjdk/map.xml b/openjdk/map.xml
index 6a878eea..03a3cdbe 100644
--- a/openjdk/map.xml
+++ b/openjdk/map.xml
@@ -1833,6 +1833,14 @@
                         <call class="sun.misc.MiscHelper" name="getAppClassLoader" sig="(Ljava.lang.ClassLoader;)Ljava.lang.ClassLoader;" />
                     </code>
                 </replace-method-call>
+                <replace-method-call class="java.lang.Thread" name="setContextClassLoader" sig="(Ljava.lang.ClassLoader;)V">
+                    <code>
+                        <!--
+                        The JDK uses setContextClassLoader() here, but we don't want to overwrite the context class loader if it has already been set.
+                        -->
+                        <callvirt class="java.lang.Thread" name="initContextClassLoader" sig="(Ljava.lang.ClassLoader;)V" />
+                    </code>
+                </replace-method-call>
             </method>
         </class>
         <class name="sun.misc.SharedSecrets">
-- 
cgit v1.2.3