diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
| commit | 97b8365cafc3a344a22d3980b8ed885f5c6d8357 (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/java/net/URLClassLoader.java | |
| parent | c648dedbde727ca3f883bb5fd773aa4af70d3369 (diff) | |
| download | gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.zip gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.gz gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.bz2 | |
Merged gcj-eclipse branch to trunk.
From-SVN: r120621
Diffstat (limited to 'libjava/java/net/URLClassLoader.java')
| -rw-r--r-- | libjava/java/net/URLClassLoader.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libjava/java/net/URLClassLoader.java b/libjava/java/net/URLClassLoader.java index 06db7d5..fd70fdf 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(); } |