Author: markt Date: Sat Nov 25 10:26:58 2006 New Revision: 479159 URL: http://svn.apache.org/viewvc?view=rev&rev=479159 Log: Fix bug 40585. Fix parametrised constructor so parameters have an effect
Modified: tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java tomcat/container/tc5.5.x/webapps/docs/changelog.xml Modified: tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java?view=diff&rev=479159&r1=479158&r2=479159 ============================================================================== --- tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java (original) +++ tomcat/connectors/trunk/juli/src/java/org/apache/juli/FileHandler.java Sat Nov 25 10:26:58 2006 @@ -47,16 +47,16 @@ public FileHandler() { - configure(); - open(); + this(null, null, null); } public FileHandler(String directory, String prefix, String suffix) { - this(); this.directory = directory; this.prefix = prefix; this.suffix = suffix; + configure(); + open(); } @@ -189,15 +189,17 @@ String tsString = ts.toString().substring(0, 19); date = tsString.substring(0, 10); - LogManager manager = LogManager.getLogManager(); String className = FileHandler.class.getName(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); // Retrieve configuration of logging file name - directory = getProperty(className + ".directory", "logs"); - prefix = getProperty(className + ".prefix", "juli."); - suffix = getProperty(className + ".suffix", ".log"); + if (directory == null) + directory = getProperty(className + ".directory", "logs"); + if (prefix == null) + prefix = getProperty(className + ".prefix", "juli."); + if (suffix == null) + suffix = getProperty(className + ".suffix", ".log"); // Get logging level for the handler setLevel(Level.parse(getProperty(className + ".level", "" + Level.ALL))); Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=479159&r1=479158&r2=479159 ============================================================================== --- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original) +++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Nov 25 10:26:58 2006 @@ -86,6 +86,10 @@ Ben Clifford. (markt) </fix> <fix> + <bug>40585</bug>: Fix parameterised constructor for o.a.juli.FileHandler + so parameters have an effect. (markt) + </fix> + <fix> <bug>40625</bug>: Stop CGIServlet swallowing the root cause of an exception. Patch provided by Takayoshi Kimura. (markt) </fix> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]