OSDN Git Service

libjava
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 30 Mar 2007 04:09:35 +0000 (04:09 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 30 Mar 2007 04:09:35 +0000 (04:09 +0000)
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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123356 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog
libjava/classpath/ChangeLog
libjava/classpath/gnu/java/util/jar/JarUtils.java
libjava/classpath/lib/gnu/java/util/jar/JarUtils.class
libjava/classpath/lib/java/util/logging/LogManager$1.class
libjava/classpath/lib/java/util/logging/LogManager.class
libjava/java/util/logging/LogManager.java

index 79ac5f4..318a4c2 100644 (file)
@@ -1,3 +1,10 @@
+2007-03-29  Tom Tromey  <tromey@redhat.com>
+
+       PR libgcj/29869:
+       * java/util/logging/LogManager.java (readConfiguration): Handle
+       comma-separated 'handlers'.  Don't try to add a non-existing
+       handler.
+
 2007-03-27  Tom Tromey  <tromey@redhat.com>
 
        * sources.am, Makefile.in: Rebuilt.
index caa611a..3d3d23f 100644 (file)
@@ -1,3 +1,9 @@
+2007-03-29  Tom Tromey  <tromey@redhat.com>
+
+       PR libgcj/29869:
+       * gnu/java/util/jar/JarUtils.java (log): Commented out.
+       (readSFManifest): Don't log.
+
 2007-03-28  Casey Marshall  <csm@gnu.org>
 
        * gnu/javax/net/ssl/provider/ClientHandshake.java (RSAGen.implRun):
index c35daec..9debf64 100644 (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)
       {
index a1acf25..b2c6b89 100644 (file)
Binary files a/libjava/classpath/lib/gnu/java/util/jar/JarUtils.class and b/libjava/classpath/lib/gnu/java/util/jar/JarUtils.class differ
index 927c28c..737e5e6 100644 (file)
Binary files a/libjava/classpath/lib/java/util/logging/LogManager$1.class and b/libjava/classpath/lib/java/util/logging/LogManager$1.class differ
index 92da8e3..2a4e0b0 100644 (file)
Binary files a/libjava/classpath/lib/java/util/logging/LogManager.class and b/libjava/classpath/lib/java/util/logging/LogManager.class differ
index 1e0192e..811310c 100644 (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);
              }
          }