diff options
Diffstat (limited to 'java/lang/SecurityManager.java')
| -rw-r--r-- | java/lang/SecurityManager.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/lang/SecurityManager.java b/java/lang/SecurityManager.java index d5c47a8d8..f47b2ff83 100644 --- a/java/lang/SecurityManager.java +++ b/java/lang/SecurityManager.java @@ -38,6 +38,8 @@ exception statement from your version. */ package java.lang; +import gnu.classpath.VMStackWalker; + import java.awt.AWTPermission; import java.io.File; import java.io.FileDescriptor; @@ -179,7 +181,10 @@ public class SecurityManager */ protected Class[] getClassContext() { - return VMSecurityManager.getClassContext(); + Class[] stack1 = VMStackWalker.getClassContext(); + Class[] stack2 = new Class[stack1.length - 1]; + System.arraycopy(stack1, 1, stack2, 0, stack1.length - 1); + return stack2; } /** @@ -201,7 +206,8 @@ public class SecurityManager */ protected ClassLoader currentClassLoader() { - return VMSecurityManager.currentClassLoader(); + Class cl = currentLoadedClass(); + return cl != null ? cl.getClassLoader() : null; } /** |