From 337d8bc191742db06b76214d37c05d9147c771fe Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 30 Mar 2007 04:09:35 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123356 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 7 +++++++ libjava/classpath/ChangeLog | 6 ++++++ libjava/classpath/gnu/java/util/jar/JarUtils.java | 14 +++++++++----- .../classpath/lib/gnu/java/util/jar/JarUtils.class | Bin 9045 -> 8687 bytes .../lib/java/util/logging/LogManager$1.class | Bin 2265 -> 2265 bytes .../lib/java/util/logging/LogManager.class | Bin 13496 -> 13528 bytes libjava/java/util/logging/LogManager.java | 12 ++++++++++-- 7 files changed, 32 insertions(+), 7 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 79ac5f4faec..318a4c2837c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2007-03-29 Tom Tromey + + 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 * sources.am, Makefile.in: Rebuilt. diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index caa611a55cd..3d3d23fe9d3 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,9 @@ +2007-03-29 Tom Tromey + + PR libgcj/29869: + * gnu/java/util/jar/JarUtils.java (log): Commented out. + (readSFManifest): Don't log. + 2007-03-28 Casey Marshall * gnu/javax/net/ssl/provider/ClientHandshake.java (RSAGen.implRun): diff --git a/libjava/classpath/gnu/java/util/jar/JarUtils.java b/libjava/classpath/gnu/java/util/jar/JarUtils.java index c35daec55ef..9debf647b66 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) { diff --git a/libjava/classpath/lib/gnu/java/util/jar/JarUtils.class b/libjava/classpath/lib/gnu/java/util/jar/JarUtils.class index a1acf2525eeae5a7a2659bdc2c66335a463c881b..b2c6b893eb0cc38ce3f934aacb9020fc6a40e671 100644 GIT binary patch literal 8687 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 TH-T6N}z(o8H<2GBb$J-xM!eyr(_grni)W{NK@ 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 S33QmvnUlwDdpS2xZunnZyoTKX diff --git a/libjava/classpath/lib/java/util/logging/LogManager$1.class b/libjava/classpath/lib/java/util/logging/LogManager$1.class index 927c28c7872e7417e1480b88de1553b1b3050740..737e5e643981132403b85c2dc9027e2ace4d7c51 100644 GIT binary patch delta 129 zcmca9cvEnL6C2~&$hwzW8T6bz`T_~jCmV_H1l=_Ip!Uc_p{}( z?ggsYKiP;qN%jbkbrh)f7*OqTpxP4*qRb~5B$-b!$S|LtypesX;sv0JiwxY%mw>XD d88n!$GUza0V=!XA!C=9Blfj<(*5q`KA^^EnB8&h4 delta 129 zcmca9cvEnL6C2~w$ZumO)OQiU7zpcL?x#!+{?z#W- zKacN{Za>^!@WdxO9|mwLf5iY3Dy}_JY`v|FZIMfSVK=oATp^D)*Nk|n6~pC+mYB2@ zYYCo2{L-FtJD0{223>6J@`YTTCM}~&tRueDrgxjvgLeqIi(}nQon3KTuiJ|oXoX2D z@hZU`PqcQowD&Cbf@qaV4sv>N9szZKGx-dg5*IE|Y#ncUjwu+g*2?bQ|4n4K8UM+)wu#wEYX}Q#(65;<1E@6g@x~ zVO5(&)=@`}bzh0s)lWN2N?VVV^tc{2=@EL=nh+T8{S`rl8bSvB+FBhrH2X=DcF{v# zIzZ1D^fV!V0LrwEShrAh5F5nJM119}M0Zatu`sTcpEc<@Y$SNwyH8ri8iRgo-Bvot zb(nr{(C@6hrNb)!pyT0fi}y6eySrm;a{L86=%rV*#vd(b@K)E~OnQUfw6+GvdHzoC z81yzFXiX^#I!!uC$1GP_i~9h*Z_)?!Pb*#)ss51QPjvQ#Vu?_D7E`EmQAqRtAI=A=@7x^t{K@1P8nTOk@hl9=(eJkqp(}JKQ zh3hwB(k^P97nFrXJ7{s#)r;XlSBl!BM$qt6N6?W*wub--ty)htdXLD{!@@@Kn?l)+(23EBjFxbfxLCs1XjvjTGW7B-Wg1S{-%w zVsO;63;px_l-z-|fWvM-t&!gp_5?j?TC1=11`W9tvAPH8D#E5utHbwWG!dof``aXU z_Tc~y(grYUr7>;7aBEL^TyiYF!Q(KW$KoO$kA)nSNKZr$pMh0830LrBte5o-JRLXj z3~c3@=;K*(KQG8$Ng zT)K%i!i}w%Lz`sHg+82vqxh!m?!y?mS+|7b$3;cWs zO88Fel}Ml_b6Rxi92yPi|Ztb zleK+fz(j!<-J9jMOkc=v2(Y&V*gGiXWAO2N7|9>lz`~h}P5`T?Uiys<>=fE3XBj?$ zeGBauNTu``J)VI`i)F64-w+mDPc+xZp|xr9&Ih6m;}O9bZB$O3!CY z&mpLLG3@^4kaviWhg#OOFgpUry?|_+z3HRdm=Mr_n1|icTz(xgL`; z&t%;U6bduP;o^_r<&R-1f=@BZl|q$rBBTsVQy!e9au8Q}Xjl1Is{B}{iqWM4NU9*# zsB)Xd^QAa|xf@Q%uORrm%^+TuswXs$jRBb>Tl|;gQ|*bkr0L(im=JYD!hZTldNX~}i?BUq%1+Dm zRAg4Y$j@xK>@Dh(q|O)D8YBm+5w%A>ZxrUMld_-%y)a)wq80S0=WXn^=X%VzH&s#@ zstK&Vid^+IaqnCdskx|7=b>7)ph3;UBsCw6>H;*Y3o&2CaDiHgHWim}wV_)rvFVsC zkbvdvMKaS(mUB)vJj>a%vz*bL4bLQa?R5YQa&C60oW*rb&F}Re7aLynJEhnqcqZCT14aEj zc|US@@zi-cc=~ppEb~5rbkc`Y-7W92dr_cXwwcxrGM{Dt&fu9c%Ilb?$_V&A15>`$ A{r~^~ delta 3408 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 H1&Tid*@fYG diff --git a/libjava/java/util/logging/LogManager.java b/libjava/java/util/logging/LogManager.java index 1e0192e3f34..811310c709d 100644 --- a/libjava/java/util/logging/LogManager.java +++ b/libjava/java/util/logging/LogManager.java @@ -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); } } -- 2.11.0