diff options
| author | Andrew Haley <aph@redhat.com> | 2005-03-21 14:50:14 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2005-03-21 14:50:14 +0000 |
| commit | e5a8980bb96ce4809da58d3ced2bd4725305368a (patch) | |
| tree | 21f6764f4fa3c779cf473479dd04137d8458622c /libjava/java/lang/ClassLoader.java | |
| parent | 21e01bf10d229bdd98b45464021c10fb510e7348 (diff) | |
| download | gcc-e5a8980bb96ce4809da58d3ced2bd4725305368a.zip gcc-e5a8980bb96ce4809da58d3ced2bd4725305368a.tar.gz gcc-e5a8980bb96ce4809da58d3ced2bd4725305368a.tar.bz2 | |
natVMSecurityManager.cc (getClassContext): Add new arg: klass.
2005-03-17 Andrew Haley <aph@redhat.com>
* 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.
From-SVN: r96803
Diffstat (limited to 'libjava/java/lang/ClassLoader.java')
| -rw-r--r-- | libjava/java/lang/ClassLoader.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java index 2621281..f2beaac 100644 --- a/libjava/java/lang/ClassLoader.java +++ b/libjava/java/lang/ClassLoader.java @@ -486,7 +486,7 @@ public abstract class ClassLoader SecurityManager sm = System.getSecurityManager(); if (sm != null) { - Class c = VMSecurityManager.getClassContext()[1]; + Class c = VMSecurityManager.getClassContext(ClassLoader.class)[1]; ClassLoader cl = c.getClassLoader(); if (cl != null && ! cl.isAncestorOf(this)) sm.checkPermission(new RuntimePermission("getClassLoader")); @@ -729,7 +729,7 @@ public abstract class ClassLoader SecurityManager sm = System.getSecurityManager(); if (sm != null) { - Class c = VMSecurityManager.getClassContext()[1]; + Class c = VMSecurityManager.getClassContext(ClassLoader.class)[1]; ClassLoader cl = c.getClassLoader(); if (cl != null && cl != systemClassLoader) sm.checkPermission(new RuntimePermission("getClassLoader")); |