Temporary hack for non i386 architectures.

diff --git a/nat/VMSecurityManager.c b/nat/VMSecurityManager.c
index dfcb05ac7154c782d0cc679f1dc1c74b85bef685..0188f30e7d070e9b8bf05115bd5f0e9d712a55d4 100644 (file)
--- a/nat/VMSecurityManager.c
+++ b/nat/VMSecurityManager.c
@@ -28,7 +28,7 @@
 
    Changes: Joseph Wenninger
 
-   $Id: VMSecurityManager.c 1067 2004-05-18 10:25:51Z stefan $
+   $Id: VMSecurityManager.c 1208 2004-06-25 12:20:52Z twisti $
 
 */
 
@@ -50,6 +50,11 @@
 JNIEXPORT java_lang_ClassLoader* JNICALL Java_java_lang_VMSecurityManager_currentClassLoader(JNIEnv *env, jclass clazz)
 {
        log_text("Java_java_lang_VMSecurityManager_currentClassLoader");
+
+       /* XXX TWISTI temporary hack! FIX ME jowenn */
+       if (cacao_initializing)
+               return NULL;
+
        init_systemclassloader();
 
        return SystemClassLoader;

diff --git a/src/native/vm/VMSecurityManager.c b/src/native/vm/VMSecurityManager.c
index dfcb05ac7154c782d0cc679f1dc1c74b85bef685..0188f30e7d070e9b8bf05115bd5f0e9d712a55d4 100644 (file)
--- a/src/native/vm/VMSecurityManager.c
+++ b/src/native/vm/VMSecurityManager.c
@@ -28,7 +28,7 @@
 
    Changes: Joseph Wenninger
 
-   $Id: VMSecurityManager.c 1067 2004-05-18 10:25:51Z stefan $
+   $Id: VMSecurityManager.c 1208 2004-06-25 12:20:52Z twisti $
 
 */
 
@@ -50,6 +50,11 @@
 JNIEXPORT java_lang_ClassLoader* JNICALL Java_java_lang_VMSecurityManager_currentClassLoader(JNIEnv *env, jclass clazz)
 {
        log_text("Java_java_lang_VMSecurityManager_currentClassLoader");
+
+       /* XXX TWISTI temporary hack! FIX ME jowenn */
+       if (cacao_initializing)
+               return NULL;
+
        init_systemclassloader();
 
        return SystemClassLoader;