You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/12/08 03:24:32 UTC
svn commit: r483782 - in /tomcat/tc6.0.x/trunk:
java/org/apache/juli/FileHandler.java webapps/docs/changelog.xml
Author: markt
Date: Thu Dec 7 18:24:30 2006
New Revision: 483782
URL: http://svn.apache.org/viewvc?view=rev&rev=483782
Log:
Port fix for 40585. Fix parametrised constructor so parameters have an effect
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java?view=diff&rev=483782&r1=483781&r2=483782
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/FileHandler.java Thu Dec 7 18:24:30 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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=483782&r1=483781&r2=483782
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Dec 7 18:24:30 2006
@@ -14,6 +14,16 @@
</properties>
<body>
+<section name="Tomcat 6.0.5 (remm)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>40585</bug>: Fix parameterised constructor for o.a.juli.FileHandler
+ so parameters have an effect. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 6.0.4 (remm)">
<subsection name="General">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org