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

Fix compiler warning

Browse Source
This commit is contained in:
Gary Gregory
2023-11-19 11:46:53 -05:00
parent 128cd42951
commit 7d6d85a444
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/apache/commons/logging/LogFactory.java
View File

@@ -601,14 +601,14 @@ public abstract class LogFactory {
double priority = 0.0; double priority = 0.0;
URL propsUrl = null; URL propsUrl = null;
try { try {
final Enumeration urls = getResources(classLoader, fileName); final Enumeration<URL> urls = getResources(classLoader, fileName);
if (urls == null) { if (urls == null) {
return null; return null;
} }
while (urls.hasMoreElements()) { while (urls.hasMoreElements()) {
final URL url = (URL) urls.nextElement(); final URL url = urls.nextElement();
final Properties newProps = getProperties(url); final Properties newProps = getProperties(url);
if (newProps != null) { if (newProps != null) {
@@ -622,8 +622,7 @@ public abstract class LogFactory {
} }
if (isDiagnosticsEnabled()) { if (isDiagnosticsEnabled()) {
logDiagnostic("[LOOKUP] Properties file found at '" + url + "'" + logDiagnostic("[LOOKUP] Properties file found at '" + url + "'" + " with priority " + priority);
" with priority " + priority);
} }
} else { } else {
final String newPriorityStr = newProps.getProperty(PRIORITY_KEY); final String newPriorityStr = newProps.getProperty(PRIORITY_KEY);
@@ -634,20 +633,16 @@ public abstract class LogFactory {
if (newPriority > priority) { if (newPriority > priority) {
if (isDiagnosticsEnabled()) { if (isDiagnosticsEnabled()) {
logDiagnostic("[LOOKUP] Properties file at '" + url + "'" + logDiagnostic("[LOOKUP] Properties file at '" + url + "'" + " with priority " + newPriority + " overrides file at '" + propsUrl
" with priority " + newPriority + + "'" + " with priority " + priority);
" overrides file at '" + propsUrl + "'" +
" with priority " + priority);
} }
propsUrl = url; propsUrl = url;
props = newProps; props = newProps;
priority = newPriority; priority = newPriority;
} else if (isDiagnosticsEnabled()) { } else if (isDiagnosticsEnabled()) {
logDiagnostic("[LOOKUP] Properties file at '" + url + "'" + logDiagnostic("[LOOKUP] Properties file at '" + url + "'" + " with priority " + newPriority + " does not override file at '"
" with priority " + newPriority + + propsUrl + "'" + " with priority " + priority);
" does not override file at '" + propsUrl + "'" +
" with priority " + priority);
} }
} }