diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-01-10 19:39:26 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-01-10 19:39:26 +0000 |
| commit | 3fd8010046b910ac2477b0feb22f187b653655d1 (patch) | |
| tree | 966d2f436ef2b2ebadf80447ac97eca99afd09f7 /libjava/java/lang/Package.java | |
| parent | 2f2bc52472b9fee4d0dd20044e9d41ece39ba4cb (diff) | |
| download | gcc-3fd8010046b910ac2477b0feb22f187b653655d1.zip gcc-3fd8010046b910ac2477b0feb22f187b653655d1.tar.gz gcc-3fd8010046b910ac2477b0feb22f187b653655d1.tar.bz2 | |
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.
From-SVN: r93155
Diffstat (limited to 'libjava/java/lang/Package.java')
| -rw-r--r-- | libjava/java/lang/Package.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libjava/java/lang/Package.java b/libjava/java/lang/Package.java index 89945ca..29b42b6 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(); } /** |