diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/VMSecurityManager.java | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5ff1892..abd13b6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-05-03 Tom Tromey <tromey@redhat.com> + + * java/lang/VMSecurityManager.java (currentClassLoader): Don't + call VMClassLoader.getSystemClassLoader. + 2005-04-29 Michael Koch <konqueror@gmx.de> * java/net/NetworkInterface.java diff --git a/libjava/java/lang/VMSecurityManager.java b/libjava/java/lang/VMSecurityManager.java index f995ec8..03e286b 100644 --- a/libjava/java/lang/VMSecurityManager.java +++ b/libjava/java/lang/VMSecurityManager.java @@ -1,6 +1,6 @@ /* * java.lang.SecurityManager: part of the Java Class Libraries project. - * Copyright (C) 1998, 2001, 2002 Free Software Foundation + * Copyright (C) 1998, 2001, 2002, 2005 Free Software Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -54,7 +54,7 @@ class VMSecurityManager // The docs above are wrong. See the online docs. // FIXME this implementation is a bit wrong too -- the docs say we // must also consider ancestors of the system class loader. - ClassLoader systemClassLoader = VMClassLoader.getSystemClassLoader(); + ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader(); Class[] classStack = getClassContext (caller); for (int i = 0; i < classStack.length; i++) { |