summaryrefslogtreecommitdiff
path: root/java/lang/Package.java
diff options
context:
space:
mode:
authorArchie Cobbs <archie@dellroad.org>2005-01-07 15:08:21 +0000
committerArchie Cobbs <archie@dellroad.org>2005-01-07 15:08:21 +0000
commitec858596f78dd4ddc318edd3d3f4ec537780c854 (patch)
treeea7ebb6d209ae7bbc3a1c34e3bbbea043cfbc3ec /java/lang/Package.java
parent53a43c88b4600340bd75f20120d26ed6afdc2065 (diff)
downloadclasspath-ec858596f78dd4ddc318edd3d3f4ec537780c854.tar.gz
Re-committing now that the 0.13 release has been tagged:
* NEWS: Document changes. * java/lang/Class.java (newInstance(), getClassLoader(), forName(String), forName(String, boolean, ClassLoader)): Use new VMStackWalker methods. * java/lang/ClassLoader.java (getParent(), getSystemClassLoader()): Likewise. * java/lang/Package.java (getPackages()): Likewise. * java/lang/SecurityManager.java (getClassContext()): Likewise. * java/util/ResourceBundle.java (getBundle()): Likewise. * java/lang/Runtime.java (load(), loadLibrary()): Load the native library using the calling class' class loader. * java/lang/System.java (load(), loadLibrary()): Likewise. (currentClassLoader()): implement via currentLoadedClass(). * vm/reference/gnu/classpath/VMStackWalker.java: New class. * vm/reference/java/lang/VMRuntime.java (nativeLoad()): Add a ClassLoader parameter. * vm/reference/java/lang/VMSecurityManager.java: Removed.
Diffstat (limited to 'java/lang/Package.java')
-rw-r--r--java/lang/Package.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/lang/Package.java b/java/lang/Package.java
index 89945cadd..23838d681 100644
--- a/java/lang/Package.java
+++ b/java/lang/Package.java
@@ -37,6 +37,8 @@ exception statement from your version. */
package java.lang;
+import gnu.classpath.VMStackWalker;
+
import java.net.URL;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
@@ -273,7 +275,7 @@ public class Package
public static Package getPackage(String name)
{
// Get the caller's classloader
- ClassLoader cl = VMSecurityManager.currentClassLoader();
+ ClassLoader cl = VMStackWalker.getCallingClassLoader();
return cl != null ? cl.getPackage(name) : null;
}
@@ -286,8 +288,7 @@ public class Package
public static Package[] getPackages()
{
// Get the caller's classloader
- Class c = VMSecurityManager.getClassContext()[1];
- ClassLoader cl = c.getClassLoader();
+ ClassLoader cl = VMStackWalker.getCallingClassLoader();
// 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.