From 743d66d0d409fc453f1172d70bdbb5bf5bfc4737 Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 10 Jan 2005 19:39:26 +0000 Subject: PR libgcj/12016, PR libgcj/18405, PR libgcj/17738: * java/lang/Package.java (getPackages): Use VMClassLoader when appropriate. (getPackage): Likewise. * prims.cc (_Jv_CreateJavaVM): Call _Jv_RegisterBootstrapPackages. * include/jvm.h (_Jv_RegisterBootstrapPackages): Declare. * java/lang/VMClassLoader.java (getPackage): Rewrote. (getPackages): Likewise. (definedPackages): New field. (definePackageForNative): New method. * java/lang/Class.h (_Jv_FindClassInCache): Updated. * java/lang/natVMClassLoader.cc (loadClass): Updated. * defineclass.cc (handleClassBegin): Use ClassLoader.findLoadedClass. * java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Rewrote. (struct _Jv_LoaderInfo): Removed. (initiated_classes): Likewise. (_Jv_UnregisterClass): Don't use initiated_classes. (_Jv_FindClassInCache): Likewise. Removed 'loader' argument. (_Jv_FindClass): Register classes found during boostrap. (BOOTSTRAP_CLASS_LIST_SIZE): New define. (bootstrap_class_list): New global. (bootstrap_index): Likewise. (_Jv_RegisterBootstrapPackages): New function. * gnu/gcj/runtime/natVMClassLoader.cc (findClass): Call definePackageForNative. (findClass): Updated. * gnu/gcj/runtime/VMClassLoader.java (definePackageForNative): New method. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@93155 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/Package.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libjava/java/lang/Package.java') diff --git a/libjava/java/lang/Package.java b/libjava/java/lang/Package.java index 89945cadd8a..29b42b63cf1 100644 --- a/libjava/java/lang/Package.java +++ b/libjava/java/lang/Package.java @@ -1,5 +1,5 @@ /* Package.java -- information about a package - Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -274,7 +274,7 @@ public class Package { // Get the caller's classloader ClassLoader cl = VMSecurityManager.currentClassLoader(); - return cl != null ? cl.getPackage(name) : null; + return cl != null ? cl.getPackage(name) : VMClassLoader.getPackage(name); } /** @@ -288,10 +288,7 @@ public class Package // Get the caller's classloader Class c = VMSecurityManager.getClassContext()[1]; ClassLoader cl = c.getClassLoader(); - // Sun's implementation returns the packages loaded by the bootstrap - // classloader if cl is null, but right now our bootstrap classloader - // does not create any Packages. - return cl != null ? cl.getPackages() : new Package[0]; + return cl != null ? cl.getPackages() : VMClassLoader.getPackages(); } /** -- cgit v1.2.3