diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/VMClassLoader.java | 23 | ||||
| -rw-r--r-- | libjava/java/lang/natVMClassLoader.cc | 15 |
2 files changed, 4 insertions, 34 deletions
diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java index c48fc70..5566399 100644 --- a/libjava/java/lang/VMClassLoader.java +++ b/libjava/java/lang/VMClassLoader.java @@ -125,26 +125,11 @@ final class VMClassLoader * * @param c the class to resolve */ - static final native void resolveClass(Class clazz); - - static final void transformException(Class clazz, Throwable x) + static final void resolveClass(Class clazz) { - LinkageError e; - if (x instanceof LinkageError) - e = (LinkageError) x; - else if (x instanceof ClassNotFoundException) - { - e = new NoClassDefFoundError("while resolving class: " - + clazz.getName()); - e.initCause (x); - } - else - { - e = new LinkageError ("unexpected exception during linking: " - + clazz.getName()); - e.initCause (x); - } - throw e; + // There doesn't seem to be a need for this to do anything. + // Testing reveals that the JDK doesn't seem to do anything here, + // either. } /** diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index e7054fb..a94bf98 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -35,21 +35,6 @@ details. */ #include <java/lang/Runtime.h> #include <java/util/HashSet.h> -void -java::lang::VMClassLoader::resolveClass (jclass klass) -{ - JvSynchronize sync (klass); - try - { - _Jv_Linker::wait_for_state (klass, JV_STATE_LINKED); - } - catch (java::lang::Throwable *x) - { - klass->set_state(JV_STATE_ERROR); - transformException(klass, x); - } -} - java::lang::Class * java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader, jstring name, |