diff options
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(); } /** |