diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-04 15:29:22 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-05-04 15:29:22 +0000 |
commit | c08019c303e2ae6742a6d8a5195dfa7a6462b213 (patch) | |
tree | 1e7ea10ce538133713a486e931169337b691095b /libjava/gnu/gcj | |
parent | daaeaa43ed487a9564bda49dcf216223b7a0859a (diff) | |
download | ppe42-gcc-c08019c303e2ae6742a6d8a5195dfa7a6462b213.tar.gz ppe42-gcc-c08019c303e2ae6742a6d8a5195dfa7a6462b213.zip |
* java/lang/Class.h (JV_STATE_LOADING): Added comment.
* Makefile.in: Rebuilt.
* Makefile.am (nat_source_files): Added natSystemClassLoader.cc.
* gnu/gcj/runtime/natSystemClassLoader.cc: New file.
* gnu/gcj/runtime/SystemClassLoader.java (nativeClasses):
New field.
(loadedClasses): Removed.
(findClass): Declare.
(addClass): Add to nativeClasses, not loadedClasses.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@113530 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/gcj')
-rw-r--r-- | libjava/gnu/gcj/runtime/SystemClassLoader.java | 22 | ||||
-rw-r--r-- | libjava/gnu/gcj/runtime/natSystemClassLoader.cc | 31 |
2 files changed, 37 insertions, 16 deletions
diff --git a/libjava/gnu/gcj/runtime/SystemClassLoader.java b/libjava/gnu/gcj/runtime/SystemClassLoader.java index d01221167a7..7470542cb7c 100644 --- a/libjava/gnu/gcj/runtime/SystemClassLoader.java +++ b/libjava/gnu/gcj/runtime/SystemClassLoader.java @@ -22,7 +22,9 @@ public final class SystemClassLoader extends URLClassLoader super(new URL[0], parent); } - private HashMap loadedClasses; + // This holds all the "native" classes linked into the executable + // and registered with this loader. + private HashMap nativeClasses = new HashMap(); // This is called to register a native class which was linked into // the application but which is registered with the system class @@ -42,23 +44,11 @@ public final class SystemClassLoader extends URLClassLoader } // Use reflection to access the package-private "loadedClasses" field. - if (this.loadedClasses == null) - { - try - { - Class cl = java.lang.ClassLoader.class; - Field lcField = cl.getDeclaredField("loadedClasses"); - lcField.setAccessible(true); - this.loadedClasses = (HashMap) lcField.get(this); - } - catch (Exception x) - { - throw new RuntimeException(x); - } - } - this.loadedClasses.put(className, klass); + nativeClasses.put(className, klass); } + protected native Class findClass(String name); + // We add the URLs to the system class loader late. The reason for // this is that during bootstrap we don't want to parse URLs or // create URL connections, since that will result in circularities diff --git a/libjava/gnu/gcj/runtime/natSystemClassLoader.cc b/libjava/gnu/gcj/runtime/natSystemClassLoader.cc new file mode 100644 index 00000000000..7052bc8e800 --- /dev/null +++ b/libjava/gnu/gcj/runtime/natSystemClassLoader.cc @@ -0,0 +1,31 @@ +// natSystemClassLoader.cc - native code for system class loader + +/* Copyright (C) Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +#include <config.h> +#include <platform.h> + +#include <gcj/cni.h> +#include <jvm.h> +#include <execution.h> + +#include <gnu/gcj/runtime/SystemClassLoader.h> +#include <java/lang/ClassNotFoundException.h> +#include <java/util/HashMap.h> + +jclass +gnu::gcj::runtime::SystemClassLoader::findClass (jstring name) +{ + jclass result = (jclass) nativeClasses->get(name); + if (! result) + return URLClassLoader::findClass(name); + // Never return a class whose supers are not installed. + _Jv_Linker::wait_for_state (result, JV_STATE_LOADING); + return result; +} |