hello all, 2006-05-28 Raif S. Naffah <[EMAIL PROTECTED]>
* java/util/logging/FileHandler.java: Reverted previous patch. * java/util/logging/LogManager.java: Likewise. -- cheers; rsn
Index: FileHandler.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/logging/FileHandler.java,v retrieving revision 1.12 diff -u -r1.12 FileHandler.java --- FileHandler.java 28 May 2006 08:28:03 -0000 1.12 +++ FileHandler.java 28 May 2006 08:53:39 -0000 @@ -192,17 +192,6 @@ extends StreamHandler { /** - * The name of the property to set for specifying a file naming (incl. path) - * pattern to use with rotating log files. - */ - private static final String PATTERN_KEY = "java.util.logging.FileHandler.pattern"; - /** - * The default pattern to use when the <code>PATTERN_KEY</code> property was - * not specified in the logging.properties file. - */ - private static final String DEFAULT_PATTERN = "%h/java%u.log"; - - /** * The number of bytes a log file is approximately allowed to reach * before it is closed and the handler switches to the next file in * the rotating set. A value of zero means that files can grow @@ -263,7 +252,8 @@ public FileHandler() throws IOException, SecurityException { - this(LogManager.getStringProperty(PATTERN_KEY, DEFAULT_PATTERN), + this(/* pattern: use configiguration */ null, + LogManager.getIntProperty("java.util.logging.FileHandler.limit", /* default */ 0), Index: LogManager.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/logging/LogManager.java,v retrieving revision 1.20 diff -u -r1.20 LogManager.java --- LogManager.java 28 May 2006 08:28:03 -0000 1.20 +++ LogManager.java 28 May 2006 08:54:16 -0000 @@ -777,22 +777,6 @@ } /** - * Returns the value of a configuration property as a String. - * <p> - * This function is a helper used by the Classpath implementation of - * java.util.logging, it is <em>not</em> specified in the logging API. - * - * @param name the name of the configuration property to fetch. - * @param defaultValue the value that will be returned if the property is not - * defined. - */ - static String getStringProperty(String name, String defaultValue) - { - String result = getLogManager().getProperty(name); - return result == null ? defaultValue : result; - } - - /** * An instance of <code>LoggingPermission("control")</code> * that is shared between calls to <code>checkAccess()</code>. */
pgp9U5xzh4Kq4.pgp
Description: PGP signature