PR149: Used wrong class loader.

[cacao.git] / src / vm / linker.cpp

diff --git a/src/vm/linker.cpp b/src/vm/linker.cpp
index 4cede0109c4a7c2c99e9bbeb9114e892f04ee48b..aa6cc39bc98a4799ed92bd710e4db67a09628b43 100644 (file)
--- a/src/vm/linker.cpp
+++ b/src/vm/linker.cpp
@@ -1,6 +1,6 @@
 /* src/vm/linker.cpp - class linker functions
 
-   Copyright (C) 1996-2005, 2006, 2007, 2008, 2010
+   Copyright (C) 1996, 2011
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
@@ -298,6 +298,12 @@ void linker_init(void)
 
        if (!link_class(class_sun_reflect_MagicAccessorImpl))
                vm_abort("linker_init: linking failed");
+
+       if (!link_class(class_sun_reflect_MethodAccessorImpl))
+               vm_abort("linker_init: linking failed");
+
+       if (!link_class(class_sun_reflect_ConstructorAccessorImpl))
+               vm_abort("linker_init: linking failed");
 # endif
 
        if (!link_class(arrayclass_java_lang_Object))
@@ -383,7 +389,7 @@ classinfo *link_class(classinfo *c)
 
        if (c == NULL) {
                exceptions_throw_nullpointerexception();
-               return NULL;
+               return 0;
        }
 
        LOCK_MONITOR_ENTER(c);
@@ -433,7 +439,8 @@ classinfo *link_class(classinfo *c)
        RT_TIMING_TIME_DIFF(time_start,time_end,RT_TIMING_LINK_TOTAL);
 
        // Hook point just after a class was linked.
-       Hook::class_linked(r);
+       if (!Hook::class_linked(r))
+               return 0;
 
        return r;
 }