diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-03-30 04:09:35 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-03-30 04:09:35 +0000 |
| commit | cc5e1fab404f5c6c6f6f7e79c5626fc681eae97d (patch) | |
| tree | 8b08d6e0dec0395e2de932fcd3c04af282a603c0 /libjava/classpath/gnu/java | |
| parent | 1a54978869b510d5b712778ae5e32521459f3791 (diff) | |
| download | gcc-cc5e1fab404f5c6c6f6f7e79c5626fc681eae97d.zip gcc-cc5e1fab404f5c6c6f6f7e79c5626fc681eae97d.tar.gz gcc-cc5e1fab404f5c6c6f6f7e79c5626fc681eae97d.tar.bz2 | |
re PR libgcj/29869 (LogManager class loading failure with Tomcat)
libjava
PR libgcj/29869:
* java/util/logging/LogManager.java (readConfiguration): Handle
comma-separated 'handlers'. Don't try to add a non-existing
handler.
libgcj/classpath
PR libgcj/29869:
* gnu/java/util/jar/JarUtils.java (log): Commented out.
(readSFManifest): Don't log.
From-SVN: r123356
Diffstat (limited to 'libjava/classpath/gnu/java')
| -rw-r--r-- | libjava/classpath/gnu/java/util/jar/JarUtils.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libjava/classpath/gnu/java/util/jar/JarUtils.java b/libjava/classpath/gnu/java/util/jar/JarUtils.java index c35daec..9debf64 100644 --- a/libjava/classpath/gnu/java/util/jar/JarUtils.java +++ b/libjava/classpath/gnu/java/util/jar/JarUtils.java @@ -1,5 +1,5 @@ /* JarUtils.java -- Utility methods for reading/writing Manifest[-like] files - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,7 +62,10 @@ import java.util.logging.Logger; */ public abstract class JarUtils { - private static final Logger log = Logger.getLogger(JarUtils.class.getName()); + // We used to log here, but this causes problems during bootstrap, + // and it didn't seem worthwhile to preserve this. Still, this + // might be useful for debugging. + // private static final Logger log = Logger.getLogger(JarUtils.class.getName()); public static final String META_INF = "META-INF/"; public static final String DSA_SUFFIX = ".DSA"; public static final String SF_SUFFIX = ".SF"; @@ -112,9 +115,10 @@ public abstract class JarUtils { String version = expectHeader(version_header, br); attr.putValue(SIGNATURE_VERSION, version); - if (! DEFAULT_SF_VERSION.equals(version)) - log.warning("Unexpected version number: " + version - + ". Continue (but may fail later)"); + // This may cause problems during VM bootstrap. + // if (! DEFAULT_SF_VERSION.equals(version)) + // log.warning("Unexpected version number: " + version + // + ". Continue (but may fail later)"); } catch (IOException ioe) { |