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

Fix compiler warnings

Browse Source
This commit is contained in:
Gary Gregory
2023-11-19 16:05:15 -05:00
parent 21b3a91d2b
commit 0e548f1fb4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,7 +208,7 @@ public abstract class LogFactory {
* The previously constructed {@code LogFactory} instances, keyed by * The previously constructed {@code LogFactory} instances, keyed by
* the {@code ClassLoader} with which it was created. * the {@code ClassLoader} with which it was created.
*/ */
protected static Hashtable factories; protected static Hashtable<ClassLoader, LogFactory> factories;
/** /**
@@ -415,8 +415,8 @@ public abstract class LogFactory {
* that LogFactory.release(contextClassLoader) is called whenever a * that LogFactory.release(contextClassLoader) is called whenever a
* webapp is undeployed. * webapp is undeployed.
*/ */
private static Hashtable createFactoryStore() { private static Hashtable<ClassLoader, LogFactory> createFactoryStore() {
Hashtable result = null; Hashtable<ClassLoader, LogFactory> result = null;
String storeImplementationClass; String storeImplementationClass;
try { try {
storeImplementationClass = getSystemProperty(HASHTABLE_IMPLEMENTATION_PROPERTY, null); storeImplementationClass = getSystemProperty(HASHTABLE_IMPLEMENTATION_PROPERTY, null);
@@ -449,7 +449,7 @@ public abstract class LogFactory {
} }
} }
if (result == null) { if (result == null) {
result = new Hashtable(); result = new Hashtable<>();
} }
return result; return result;
} }
@@ -518,7 +518,7 @@ public abstract class LogFactory {
// nb: nullClassLoaderFactory might be null. That's ok. // nb: nullClassLoaderFactory might be null. That's ok.
return nullClassLoaderFactory; return nullClassLoaderFactory;
} }
return (LogFactory) factories.get(contextClassLoader); return factories.get(contextClassLoader);
} }
@@ -1468,7 +1468,7 @@ public abstract class LogFactory {
logDiagnostic("Releasing factory for classloader " + objectId(classLoader)); logDiagnostic("Releasing factory for classloader " + objectId(classLoader));
} }
// factories is not final and could be replaced in this block. // factories is not final and could be replaced in this block.
final Hashtable factories = LogFactory.factories; final Hashtable<ClassLoader, LogFactory> factories = LogFactory.factories;
synchronized (factories) { synchronized (factories) {
if (classLoader == null) { if (classLoader == null) {
if (nullClassLoaderFactory != null) { if (nullClassLoaderFactory != null) {
@@ -1476,7 +1476,7 @@ public abstract class LogFactory {
nullClassLoaderFactory = null; nullClassLoaderFactory = null;
} }
} else { } else {
final LogFactory factory = (LogFactory) factories.get(classLoader); final LogFactory factory = factories.get(classLoader);
if (factory != null) { if (factory != null) {
factory.release(); factory.release();
factories.remove(classLoader); factories.remove(classLoader);
@@ -1498,11 +1498,11 @@ public abstract class LogFactory {
logDiagnostic("Releasing factory for all classloaders."); logDiagnostic("Releasing factory for all classloaders.");
} }
// factories is not final and could be replaced in this block. // factories is not final and could be replaced in this block.
final Hashtable factories = LogFactory.factories; final Hashtable<ClassLoader, LogFactory> factories = LogFactory.factories;
synchronized (factories) { synchronized (factories) {
final Enumeration elements = factories.elements(); final Enumeration<LogFactory> elements = factories.elements();
while (elements.hasMoreElements()) { while (elements.hasMoreElements()) {
final LogFactory element = (LogFactory) elements.nextElement(); final LogFactory element = elements.nextElement();
element.release(); element.release();
} }
factories.clear(); factories.clear();