From e609c24181bef57a03d0a1a0c4452016b95942e3 Mon Sep 17 00:00:00 2001 From: bryce Date: Tue, 11 Apr 2006 16:23:00 +0000 Subject: * gnu/gcj/runtime/SystemClassLoader.java (addClass): Get the value of package-private field "loadedClasses" using reflection. * java/lang/VMCompiler.java (compileClass): Remove unreachable catch block. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112858 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/gcj/runtime/SystemClassLoader.java | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'libjava/gnu/gcj/runtime') diff --git a/libjava/gnu/gcj/runtime/SystemClassLoader.java b/libjava/gnu/gcj/runtime/SystemClassLoader.java index efd33230fbe..d01221167a7 100644 --- a/libjava/gnu/gcj/runtime/SystemClassLoader.java +++ b/libjava/gnu/gcj/runtime/SystemClassLoader.java @@ -9,8 +9,9 @@ details. */ package gnu.gcj.runtime; import java.io.*; +import java.lang.reflect.Field; import java.util.StringTokenizer; -import java.util.HashSet; +import java.util.HashMap; import java.net.URL; import java.net.URLClassLoader; @@ -21,6 +22,8 @@ public final class SystemClassLoader extends URLClassLoader super(new URL[0], parent); } + private HashMap loadedClasses; + // This is called to register a native class which was linked into // the application but which is registered with the system class // loader after the VM is initialized. @@ -37,7 +40,23 @@ public final class SystemClassLoader extends URLClassLoader // precompiled manifest. definePackage(packageName, null, null, null, null, null, null, null); } - loadedClasses.put(className, klass); + + // 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); } // We add the URLs to the system class loader late. The reason for -- cgit v1.2.3