From 65bf3316cf384588453604be6b4f0ed3751a8b0f Mon Sep 17 00:00:00 2001 From: tromey Date: Tue, 9 Jan 2007 19:58:05 +0000 Subject: Merged gcj-eclipse branch to trunk. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/net/URLClassLoader.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libjava/java/net/URLClassLoader.java') diff --git a/libjava/java/net/URLClassLoader.java b/libjava/java/net/URLClassLoader.java index 06db7d58217..fd70fdf2045 100644 --- a/libjava/java/net/URLClassLoader.java +++ b/libjava/java/net/URLClassLoader.java @@ -1080,7 +1080,10 @@ public class URLClassLoader extends SecureClassLoader if (resource == null) { String message = className + " not found"; - if (runtimeInitialized()) + // Calling this.toString() during VM startup when a + // security manager is in force causes the stack to + // be unwound before it can properly be decoded. + if (Thread.currentThread() != null) message += " in " + this; throw new ClassNotFoundException(message); } @@ -1442,11 +1445,4 @@ public class URLClassLoader extends SecureClassLoader return loader; } } - - /** - * Tell whether runtime initialization is complete. - * - * @return whether runtime initialization is complete. - */ - private static native boolean runtimeInitialized(); } -- cgit v1.2.1