Remove extra blank lines
This commit is contained in:
@@ -70,7 +70,6 @@ public abstract class LogFactory {
|
||||
// library 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 configuration file used to
|
||||
* specify the priority of that particular configuration file. The associated value
|
||||
@@ -204,14 +203,12 @@ 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<ClassLoader, LogFactory> factories;
|
||||
|
||||
|
||||
/**
|
||||
* Previously constructed {@code LogFactory} instance as in the
|
||||
* {@code factories} map, but for the case where
|
||||
@@ -531,7 +528,6 @@ public abstract class LogFactory {
|
||||
return classLoader;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Check cached factories (keyed by contextClassLoader)
|
||||
*
|
||||
@@ -689,7 +685,6 @@ public abstract class LogFactory {
|
||||
return props;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns the current context class loader.
|
||||
* <p>
|
||||
@@ -755,7 +750,6 @@ public abstract class LogFactory {
|
||||
// Identify the class loader we will be using
|
||||
final ClassLoader contextClassLoader = getContextClassLoaderInternal();
|
||||
|
||||
|
||||
// This is an odd enough situation to report about. This
|
||||
// output will be a nuisance on JDK1.1, as the system
|
||||
// class loader is null in that environment.
|
||||
@@ -1076,7 +1070,6 @@ 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
|
||||
|
||||
@@ -41,7 +41,6 @@ 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 +68,6 @@ public class Jdk13LumberjackLogger implements Log, Serializable {
|
||||
/** Class and method found flag. */
|
||||
private boolean classAndMethodFound;
|
||||
|
||||
|
||||
/**
|
||||
* Constructs a named instance of this Logger.
|
||||
*
|
||||
@@ -80,7 +78,6 @@ public class Jdk13LumberjackLogger implements Log, Serializable {
|
||||
logger = getLogger();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Logs a message with {@code java.util.logging.Level.FINE}.
|
||||
*
|
||||
|
||||
@@ -41,7 +41,6 @@ public class Jdk14Logger implements Log, Serializable {
|
||||
*/
|
||||
protected static final Level dummyLevel = Level.FINE;
|
||||
|
||||
|
||||
/**
|
||||
* The underlying Logger implementation we are using.
|
||||
*/
|
||||
|
||||
@@ -80,14 +80,12 @@ 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 +163,6 @@ 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 +270,6 @@ 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.
|
||||
@@ -654,7 +650,6 @@ 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
|
||||
@@ -753,7 +748,6 @@ public class LogFactoryImpl extends LogFactory {
|
||||
return Boolean.parseBoolean(val);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Attempt to find an attribute (see method setAttribute) or a
|
||||
* system property with the provided name and return its value.
|
||||
|
||||
@@ -40,14 +40,12 @@ 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 +57,6 @@ public class LogKitLogger implements Log, Serializable {
|
||||
this.logger = getLogger();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Logs a message with {@code org.apache.log.Priority.DEBUG}.
|
||||
*
|
||||
@@ -73,7 +70,6 @@ public class LogKitLogger implements Log, Serializable {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Logs a message with {@code org.apache.log.Priority.DEBUG}.
|
||||
*
|
||||
|
||||
@@ -74,7 +74,6 @@ 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 +109,6 @@ 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 +128,6 @@ 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 +239,6 @@ public class SimpleLog implements Log, Serializable {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private static String getStringProperty(final String name) {
|
||||
String prop = null;
|
||||
try {
|
||||
@@ -259,11 +255,9 @@ 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 +306,6 @@ public class SimpleLog implements Log, Serializable {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Logs a message with
|
||||
* {@code org.apache.commons.logging.impl.SimpleLog.LOG_LEVEL_DEBUG}.
|
||||
@@ -369,7 +362,6 @@ public class SimpleLog implements Log, Serializable {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Log a message with {@code org.apache.commons.logging.impl.SimpleLog.LOG_LEVEL_FATAL}.
|
||||
*
|
||||
|
||||
@@ -92,7 +92,6 @@ public final class Slf4jLogFactory extends LogFactory {
|
||||
log(INFO_INT, message, t);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isDebugEnabled() {
|
||||
return logger.isDebugEnabled(MARKER);
|
||||
|
||||
Reference in New Issue
Block a user