diff --git a/src/main/java/org/apache/commons/logging/LogFactory.java b/src/main/java/org/apache/commons/logging/LogFactory.java index 6bc87c2..88418d7 100644 --- a/src/main/java/org/apache/commons/logging/LogFactory.java +++ b/src/main/java/org/apache/commons/logging/LogFactory.java @@ -69,7 +69,7 @@ public abstract class LogFactory { // lib and JCL have the necessary permissions even when the untrusted // caller does not. That's a pretty hard route to exploit though. - + /** * The name ({@code priority}) of the key in the config file used to * specify the priority of that particular config file. The associated value @@ -203,14 +203,14 @@ public abstract class LogFactory { */ private static final int MAX_BROKEN_SERVICES = 3; - + /** * The previously constructed {@code LogFactory} instances, keyed by * the {@code ClassLoader} with which it was created. */ protected static Hashtable factories; - + /** * Previously constructed {@code LogFactory} instance as in the * {@code factories} map, but for the case where @@ -530,7 +530,7 @@ public abstract class LogFactory { return classLoader; } - + /** * Check cached factories (keyed by contextClassLoader) * @@ -688,7 +688,7 @@ public abstract class LogFactory { return props; } - + /** * Returns the current context classloader. *

@@ -1075,7 +1075,7 @@ public abstract class LogFactory { }); } - + /** * Read the specified system property, using an AccessController so that * the property can be read if JCL has been granted the appropriate @@ -1592,7 +1592,7 @@ public abstract class LogFactory { * class loader would prevent garbage collection. */ public abstract void release(); - + /** * Remove any configuration attribute associated with the specified name. * If there is no such attribute, no action is taken. diff --git a/src/main/java/org/apache/commons/logging/LogSource.java b/src/main/java/org/apache/commons/logging/LogSource.java index 7239cc5..b58f2ff 100644 --- a/src/main/java/org/apache/commons/logging/LogSource.java +++ b/src/main/java/org/apache/commons/logging/LogSource.java @@ -71,7 +71,7 @@ public class LogSource { * An empty immutable {@code String} array. */ private static final String[] EMPTY_STRING_ARRAY = {}; - + static { // Is Log4J Available? @@ -127,7 +127,7 @@ public class LogSource { } } - + /** * Gets a {@code Log} instance by class. * @@ -137,7 +137,7 @@ public class LogSource { static public Log getInstance(final Class clazz) { return getInstance(clazz.getName()); } - + /** * Gets a {@code Log} instance by class name. * diff --git a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java index 317e111..9dc1e47 100644 --- a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java @@ -41,7 +41,7 @@ public class Jdk13LumberjackLogger implements Log, Serializable { /** Serializable version identifier. */ private static final long serialVersionUID = -8649807923527610591L; - + /** * This member variable simply ensures that any attempt to initialize * this class in a pre-1.4 JVM will result in an ExceptionInInitializerError. @@ -69,7 +69,7 @@ public class Jdk13LumberjackLogger implements Log, Serializable { /** Class and method found flag. */ private boolean classAndMethodFound; - + /** * Constructs a named instance of this Logger. * @@ -80,7 +80,7 @@ public class Jdk13LumberjackLogger implements Log, Serializable { logger = getLogger(); } - + /** * Logs a message with {@code java.util.logging.Level.FINE}. * diff --git a/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java b/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java index f866ce1..ea42c18 100644 --- a/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java +++ b/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java @@ -41,7 +41,7 @@ public class Jdk14Logger implements Log, Serializable { */ protected static final Level dummyLevel = Level.FINE; - + /** * The underlying Logger implementation we are using. */ diff --git a/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java b/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java index b93c0d9..11245b9 100644 --- a/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java @@ -63,7 +63,7 @@ public class Log4JLogger implements Log, Serializable { // If an ExceptionInInitializerError is generated, then LogFactoryImpl // will treat that as meaning that the appropriate underlying logging // library is just not present - if discovery is in progress then - // discovery will continue. + // discovery will continue. static { if (!Priority.class.isAssignableFrom(Level.class)) { // nope, this is log4j 1.3, so force an ExceptionInInitializerError diff --git a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java index 8edaa0b..488e9ac 100644 --- a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java +++ b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java @@ -80,14 +80,14 @@ public class LogFactoryImpl extends LogFactory { */ private static final String[] EMPTY_STRING_ARRAY = {}; - + /** * The name ({@code org.apache.commons.logging.Log}) of the system * property identifying our {@link Log} implementation class. */ public static final String LOG_PROPERTY = "org.apache.commons.logging.Log"; - + /** * The deprecated system property used for backwards compatibility with * old versions of JCL. @@ -165,7 +165,7 @@ public class LogFactoryImpl extends LogFactory { return LogFactory.getClassLoader(clazz); } - + /** * Gets the context ClassLoader. * This method is a workaround for a java 1.2 compiler bug. @@ -273,7 +273,7 @@ public class LogFactoryImpl extends LogFactory { */ protected Class[] logConstructorSignature = { String.class }; - + /** * The one-argument {@code setLogFactory} method of the selected * {@link org.apache.commons.logging.Log} method, if it exists. @@ -488,7 +488,7 @@ public class LogFactoryImpl extends LogFactory { // // These methods only defined as workarounds for a java 1.2 bug; // theoretically none of these are needed. - + /** * Attempts to create a Log instance for the given category name. * Follows the discovery process described in the class Javadoc. @@ -654,7 +654,7 @@ public class LogFactoryImpl extends LogFactory { return attributes.get(name); } - + /** * Return an array containing the names of all currently defined * configuration attributes. If there are no such attributes, a zero diff --git a/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java index f429794..d2112d0 100644 --- a/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java @@ -40,14 +40,14 @@ public class LogKitLogger implements Log, Serializable { /** Serializable version identifier. */ private static final long serialVersionUID = 3768538055836059519L; - + /** Logging goes to this {@code LogKit} logger */ protected transient volatile Logger logger; /** Name of this logger */ protected String name; - + /** * Constructs {@code LogKitLogger} which wraps the {@code LogKit} * logger with given name. @@ -59,7 +59,7 @@ public class LogKitLogger implements Log, Serializable { this.logger = getLogger(); } - + /** * Logs a message with {@code org.apache.log.Priority.DEBUG}. * @@ -73,7 +73,7 @@ public class LogKitLogger implements Log, Serializable { } } - + /** * Logs a message with {@code org.apache.log.Priority.DEBUG}. * diff --git a/src/main/java/org/apache/commons/logging/impl/SimpleLog.java b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java index 78ae890..b583977 100644 --- a/src/main/java/org/apache/commons/logging/impl/SimpleLog.java +++ b/src/main/java/org/apache/commons/logging/impl/SimpleLog.java @@ -74,7 +74,7 @@ public class SimpleLog implements Log, Serializable { /** Serializable version identifier. */ private static final long serialVersionUID = 136942970684951178L; - + /** All system properties used by {@code SimpleLog} start with this */ static protected final String systemPrefix = "org.apache.commons.logging.simplelog."; @@ -110,7 +110,7 @@ public class SimpleLog implements Log, Serializable { */ static protected DateFormat dateFormatter; - + /** "Trace" level logging. */ public static final int LOG_LEVEL_TRACE = 1; /** "Debug" level logging. */ @@ -130,7 +130,7 @@ public class SimpleLog implements Log, Serializable { /** Enable no logging levels */ public static final int LOG_LEVEL_OFF = LOG_LEVEL_FATAL + 1; - + // Initialize class attributes. // Load properties file, if found. // Override with system properties. @@ -242,7 +242,7 @@ public class SimpleLog implements Log, Serializable { }); } - + private static String getStringProperty(final String name) { String prop = null; try { @@ -259,11 +259,11 @@ public class SimpleLog implements Log, Serializable { /** The name of this simple log instance */ protected volatile String logName; - + /** The current log level */ protected volatile int currentLogLevel; - + /** The short name of this simple log instance */ private volatile String shortLogName; @@ -312,7 +312,7 @@ public class SimpleLog implements Log, Serializable { } } - + /** * Logs a message with * {@code org.apache.commons.logging.impl.SimpleLog.LOG_LEVEL_DEBUG}. @@ -369,7 +369,7 @@ public class SimpleLog implements Log, Serializable { } } - + /** * Log a message with {@code org.apache.commons.logging.impl.SimpleLog.LOG_LEVEL_FATAL}. *