Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Fix bug where priority of first commons-logging.properties file found was ignored.

Browse Source 
Also improve diagnostics output.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@394461 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
2006-04-16 11:36:37 +00:00
parent 3555fbc436
commit 1c67c2510f
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/java/org/apache/commons/logging/LogFactory.java
View File

@@ -1387,16 +1387,39 @@ public abstract class LogFactory {
if (newProps != null) { if (newProps != null) {
if (props == null) { if (props == null) {
props = newProps; props = newProps;
String priorityStr = props.getProperty(PRIORITY_KEY);
priority = 0.0;
if (priorityStr != null) {
priority = Double.parseDouble(priorityStr);
}
if (isDiagnosticsEnabled()) {
logDiagnostic(
"[LOOKUP] First properties file found at '" + url + "'");
}
} else { } else {
String newPriorityStr = newProps.getProperty(PRIORITY_KEY); String newPriorityStr = newProps.getProperty(PRIORITY_KEY);
double newPriority = 0.0;
if (newPriorityStr != null) { if (newPriorityStr != null) {
double newPriority = Double.valueOf(newPriorityStr).doubleValue(); newPriority = Double.parseDouble(newPriorityStr);
if (newPriority > priority) { }
props = newProps;
priority = newPriority; if (newPriority > priority) {
props = newProps;
priority = newPriority;
if (isDiagnosticsEnabled()) {
logDiagnostic(
"[LOOKUP] New properties file found at '" + url + "'"
+ " has higher priority than earlier file.");
} }
} else {
logDiagnostic(
"[LOOKUP] New properties file found at '" + url + "'"
+ " has less priority than earlier file -- ignoring.");
} }
} }
} }
} }
} catch (SecurityException e) { } catch (SecurityException e) {