* Merged with default branch at rev 16f3633aaa5a.

[cacao.git] / src / native / vm / gnu / gnu_classpath_VMStackWalker.c

diff --git a/src/native/vm/gnu/gnu_classpath_VMStackWalker.c b/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
index 5d772e0a7cb7217170df72802518e315c91b0d6b..b44c6470a624fd6d94739506bae9277488a8c990 100644 (file)
--- a/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
+++ b/src/native/vm/gnu/gnu_classpath_VMStackWalker.c
@@ -131,7 +131,10 @@ JNIEXPORT java_lang_ClassLoader* JNICALL Java_gnu_classpath_VMStackWalker_getCal
        c  = (classinfo *) LLNI_array_direct(oa, 1);
        cl = c->classloader;
 
-       return (java_lang_ClassLoader *) cl;
+       if (cl == NULL)
+               return NULL;
+
+       return (java_lang_ClassLoader *) cl->object;
 }
 
 
@@ -157,7 +160,7 @@ JNIEXPORT java_lang_ClassLoader* JNICALL Java_gnu_classpath_VMStackWalker_firstN
                cl = c->classloader;
 
                if (cl != NULL)
-                       return (java_lang_ClassLoader *) cl;
+                       return (java_lang_ClassLoader *) cl->object;
        }
 
        return NULL;