procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/29869 (LogManager class loading failure with Tomcat)

Browse source 
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
This commit is contained in:
Tom Tromey 2007-03-30 04:09:35 +00:00 • committed by Tom Tromey
parent 1a54978869
commit cc5e1fab40
7 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libjava/classpath/gnu/java/util/jar/JarUtils.java
View file

@ -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)
{