From d268be3507895e8a4593f668cd691b0ddf006b45 Mon Sep 17 00:00:00 2001 From: aph Date: Mon, 21 Mar 2005 14:50:14 +0000 Subject: 2005-03-17 Andrew Haley * java/lang/natVMSecurityManager.cc (getClassContext): Add new arg: klass. Pass klass to _Jv_StackTrace::GetClassContext(). * java/lang/ClassLoader.java (getParent): Pass class to VMSecurityManager.getClassContext() (getSystemClassLoader): Likewise. * java/lang/Package.java (getPackage): Likewise. (getPackages): Likewise. * java/lang/SecurityManager.java (getClassContext): Likewise. (currentClassLoader): Likewise. * java/lang/VMSecurityManager.java: (getClassContext): Likewise. (currentClassLoader) Add new arg: caller. Pass caller to VMSecurityManager.getClassContext. * stacktrace.cc (GetClassContext): Correct calculation of jframe_count. * boehm.cc (_Jv_MarkObj): (_Jv_MarkObj): Mark im->source_file_name. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96803 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/Package.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libjava/java/lang/Package.java') diff --git a/libjava/java/lang/Package.java b/libjava/java/lang/Package.java index 29b42b63cf1..bddb370f1e7 100644 --- a/libjava/java/lang/Package.java +++ b/libjava/java/lang/Package.java @@ -273,7 +273,7 @@ public class Package public static Package getPackage(String name) { // Get the caller's classloader - ClassLoader cl = VMSecurityManager.currentClassLoader(); + ClassLoader cl = VMSecurityManager.currentClassLoader(Package.class); return cl != null ? cl.getPackage(name) : VMClassLoader.getPackage(name); } @@ -286,7 +286,7 @@ public class Package public static Package[] getPackages() { // Get the caller's classloader - Class c = VMSecurityManager.getClassContext()[1]; + Class c = VMSecurityManager.getClassContext(Package.class)[1]; ClassLoader cl = c.getClassLoader(); return cl != null ? cl.getPackages() : VMClassLoader.getPackages(); } -- cgit v1.2.3