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
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

View file

@ -559,13 +559,21 @@ public class LogManager
if ("handlers".equals(key))
{
StringTokenizer tokenizer = new StringTokenizer(value);
// In Java 5 and earlier this was specified to be
// whitespace-separated, but in reality it also accepted
// commas (tomcat relied on this), and in Java 6 the
// documentation was updated to fit the implementation.
StringTokenizer tokenizer = new StringTokenizer(value,
" \t\n\r\f,");
while (tokenizer.hasMoreTokens())
{
String handlerName = tokenizer.nextToken();
Handler handler = (Handler)
createInstance(handlerName, Handler.class, key);
Logger.root.addHandler(handler);
// Tomcat also relies on the implementation ignoring
// items in 'handlers' which are not class names.
if (handler != null)
Logger.root.addHandler(handler);
}
}