VMClassLoader.java (transformException): Removed.
* java/lang/VMClassLoader.java (transformException): Removed. (resolveClass): No longer native. Now does nothing. * java/lang/natVMClassLoader.cc (resolveClass): Removed. From-SVN: r98516
This commit is contained in:
@@ -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.
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user