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

No need to nest in else.

Browse Source
This commit is contained in:
Gary Gregory
2021-03-05 14:43:24 -05:00
parent 34ea3d6a0d
commit 1642a1bd98
6 changed files with 96 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -878,9 +878,8 @@ public abstract class LogFactory {
//
// nb: nullClassLoaderFactory might be null. That's ok.
return nullClassLoaderFactory;
} else {
return (LogFactory) factories.get(contextClassLoader);
}
return (LogFactory) factories.get(contextClassLoader);
}
/**
@@ -1239,9 +1238,8 @@ public abstract class LogFactory {
public Object run() {
if (loader != null) {
return loader.getResourceAsStream(name);
} else {
return ClassLoader.getSystemResourceAsStream(name);
}
return ClassLoader.getSystemResourceAsStream(name);
}
});
}
@@ -1267,9 +1265,8 @@ public abstract class LogFactory {
try {
if (loader != null) {
return loader.getResources(name);
} else {
return ClassLoader.getSystemResources(name);
}
return ClassLoader.getSystemResources(name);
} catch (final IOException e) {
if (isDiagnosticsEnabled()) {
logDiagnostic("Exception while trying to find configuration file " +
@@ -1475,17 +1472,17 @@ public abstract class LogFactory {
if (dest.equals("STDOUT")) {
return System.out;
} else if (dest.equals("STDERR")) {
}
if (dest.equals("STDERR")) {
return System.err;
} else {
try {
// open the file in append mode
final FileOutputStream fos = new FileOutputStream(dest, true);
return new PrintStream(fos);
} catch (final IOException ex) {
// We should report this to the user - but how?
return null;
}
}
try {
// open the file in append mode
final FileOutputStream fos = new FileOutputStream(dest, true);
return new PrintStream(fos);
} catch (final IOException ex) {
// We should report this to the user - but how?
return null;
}
}
@@ -1651,9 +1648,8 @@ public abstract class LogFactory {
public static String objectId(final Object o) {
if (o == null) {
return "null";
} else {
return o.getClass().getName() + "@" + System.identityHashCode(o);
}
return o.getClass().getName() + "@" + System.identityHashCode(o);
}
// ----------------------------------------------------------------------

50
src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
View File

@@ -682,12 +682,11 @@ public class LogFactoryImpl extends LogFactory {
logDiagnostic("Did not find '" + name + "'.");
}
return false;
} else {
if (isDiagnosticsEnabled()) {
logDiagnostic("Found '" + name + "'.");
}
return true;
}
if (isDiagnosticsEnabled()) {
logDiagnostic("Found '" + name + "'.");
}
return true;
} catch (final LogConfigurationException e) {
if (isDiagnosticsEnabled()) {
logDiagnostic("Logging system '" + name + "' is available but not useable.");
@@ -1166,22 +1165,20 @@ public class LogFactoryImpl extends LogFactory {
// In some classloading setups (e.g. JBoss with its
// UnifiedLoaderRepository) this can still work, so if user hasn't
// forbidden it, just return the contextClassLoader.
if (allowFlawedContext) {
if (isDiagnosticsEnabled()) {
logDiagnostic("[WARNING] the context classloader is not part of a" +
" parent-child relationship with the classloader that" +
" loaded LogFactoryImpl.");
}
// If contextClassLoader were null, getLowestClassLoader() would
// have returned thisClassLoader. The fact we are here means
// contextClassLoader is not null, so we can just return it.
return contextClassLoader;
}
else {
if (!allowFlawedContext) {
throw new LogConfigurationException("Bad classloader hierarchy; LogFactoryImpl was loaded via" +
" a classloader that is not related to the current context" +
" classloader.");
}
if (isDiagnosticsEnabled()) {
logDiagnostic("[WARNING] the context classloader is not part of a" +
" parent-child relationship with the classloader that" +
" loaded LogFactoryImpl.");
}
// If contextClassLoader were null, getLowestClassLoader() would
// have returned thisClassLoader. The fact we are here means
// contextClassLoader is not null, so we can just return it.
return contextClassLoader;
}
if (baseClassLoader != contextClassLoader) {
@@ -1190,21 +1187,20 @@ public class LogFactoryImpl extends LogFactory {
// that there are a number of broken systems out there which create
// custom classloaders but fail to set the context classloader so
// we handle those flawed systems anyway.
if (allowFlawedContext) {
if (isDiagnosticsEnabled()) {
logDiagnostic(
"Warning: the context classloader is an ancestor of the" +
" classloader that loaded LogFactoryImpl; it should be" +
" the same or a descendant. The application using" +
" commons-logging should ensure the context classloader" +
" is used correctly.");
}
} else {
if (!allowFlawedContext) {
throw new LogConfigurationException(
"Bad classloader hierarchy; LogFactoryImpl was loaded via" +
" a classloader that is not related to the current context" +
" classloader.");
}
if (isDiagnosticsEnabled()) {
logDiagnostic(
"Warning: the context classloader is an ancestor of the" +
" classloader that loaded LogFactoryImpl; it should be" +
" the same or a descendant. The application using" +
" commons-logging should ensure the context classloader" +
" is used correctly.");
}
}
return baseClassLoader;

7
src/main/java/org/apache/commons/logging/impl/SimpleLog.java
View File

@@ -633,9 +633,7 @@ public class SimpleLog implements Log, Serializable {
* obtain a class loader) will trigger this exception where
* we can make a distinction.
*/
if (e.getTargetException() instanceof SecurityException) {
// ignore
} else {
if (!(e.getTargetException() instanceof SecurityException)) {
// Capture 'e.getTargetException()' exception for details
// alternate: log 'e.getTargetException()', and pass back 'e'.
throw new LogConfigurationException
@@ -664,9 +662,8 @@ public class SimpleLog implements Log, Serializable {
if (threadCL != null) {
return threadCL.getResourceAsStream(name);
} else {
return ClassLoader.getSystemResourceAsStream(name);
}
return ClassLoader.getSystemResourceAsStream(name);
}
});
}