Loggers should be final
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 9 Nov 2009 20:51:17 +0000 (20:51 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 9 Nov 2009 20:51:17 +0000 (20:51 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834226 13f79535-47bb-0310-9956-ffa450edef68

98 files changed:
java/org/apache/catalina/authenticator/AuthenticatorBase.java
java/org/apache/catalina/authenticator/BasicAuthenticator.java
java/org/apache/catalina/authenticator/DigestAuthenticator.java
java/org/apache/catalina/authenticator/FormAuthenticator.java
java/org/apache/catalina/connector/Connector.java
java/org/apache/catalina/connector/CoyoteAdapter.java
java/org/apache/catalina/connector/MapperListener.java
java/org/apache/catalina/core/ApplicationDispatcher.java
java/org/apache/catalina/core/AprLifecycleListener.java
java/org/apache/catalina/core/AsyncContextImpl.java
java/org/apache/catalina/core/JasperListener.java
java/org/apache/catalina/core/NamingContextListener.java
java/org/apache/catalina/core/StandardContext.java
java/org/apache/catalina/core/StandardEngine.java
java/org/apache/catalina/core/StandardHostValve.java
java/org/apache/catalina/core/StandardPipeline.java
java/org/apache/catalina/core/StandardServer.java
java/org/apache/catalina/core/StandardService.java
java/org/apache/catalina/filters/RemoteAddrFilter.java
java/org/apache/catalina/filters/RemoteHostFilter.java
java/org/apache/catalina/filters/RemoteIpFilter.java
java/org/apache/catalina/filters/RequestDumperFilter.java
java/org/apache/catalina/ha/backend/HeartbeatListener.java
java/org/apache/catalina/ha/backend/MultiCastSender.java
java/org/apache/catalina/ha/backend/TcpSender.java
java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
java/org/apache/catalina/mbeans/ServerLifecycleListener.java
java/org/apache/catalina/realm/CombinedRealm.java
java/org/apache/catalina/realm/JAASMemoryLoginModule.java
java/org/apache/catalina/realm/JAASRealm.java
java/org/apache/catalina/realm/LockOutRealm.java
java/org/apache/catalina/realm/MemoryRealm.java
java/org/apache/catalina/realm/RealmBase.java
java/org/apache/catalina/session/PersistentManagerBase.java
java/org/apache/catalina/startup/Bootstrap.java
java/org/apache/catalina/startup/ClassLoaderFactory.java
java/org/apache/catalina/startup/ClusterRuleSetFactory.java
java/org/apache/catalina/startup/ConnectorCreateRule.java
java/org/apache/catalina/startup/Embedded.java
java/org/apache/catalina/startup/ExpandWar.java
java/org/apache/catalina/startup/Tool.java
java/org/apache/catalina/tribes/io/BufferPool.java
java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
java/org/apache/catalina/tribes/util/Arrays.java
java/org/apache/catalina/users/MemoryUserDatabase.java
java/org/apache/catalina/valves/AccessLogValve.java
java/org/apache/catalina/valves/ExtendedAccessLogValve.java
java/org/apache/catalina/valves/RemoteIpValve.java
java/org/apache/catalina/valves/ValveBase.java
java/org/apache/jasper/EmbeddedServletOptions.java
java/org/apache/jasper/JspC.java
java/org/apache/jasper/compiler/JspConfig.java
java/org/apache/jasper/compiler/JspReader.java
java/org/apache/jasper/compiler/JspRuntimeContext.java
java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
java/org/apache/jasper/compiler/TldLocationsCache.java
java/org/apache/jasper/runtime/JspFactoryImpl.java
java/org/apache/jasper/runtime/TagHandlerPool.java
java/org/apache/jasper/servlet/JspServlet.java
java/org/apache/jasper/servlet/JspServletWrapper.java
java/org/apache/tomcat/util/digester/GenericParser.java
java/org/apache/tomcat/util/digester/XercesParser.java
java/org/apache/tomcat/util/modeler/BaseModelMBean.java
java/org/apache/tomcat/util/modeler/Registry.java
java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
java/org/apache/tomcat/util/net/AbstractEndpoint.java
java/org/apache/tomcat/util/net/AprEndpoint.java
java/org/apache/tomcat/util/net/JIoEndpoint.java
java/org/apache/tomcat/util/net/NioBlockingSelector.java
java/org/apache/tomcat/util/net/NioEndpoint.java
java/org/apache/tomcat/util/net/NioSelectorPool.java
modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java
modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
test/org/apache/catalina/tribes/demos/LoadTest.java
webapps/examples/WEB-INF/classes/async/Async0.java
webapps/examples/WEB-INF/classes/async/Async1.java
webapps/examples/WEB-INF/classes/async/Async2.java
webapps/examples/WEB-INF/classes/async/Async3.java

index f85e39b..a84bfaa 100644 (file)
@@ -77,7 +77,7 @@ import org.apache.juli.logging.LogFactory;
 public abstract class AuthenticatorBase
     extends ValveBase
     implements Authenticator, Lifecycle {
-    private static Log log = LogFactory.getLog(AuthenticatorBase.class);
+    private static final Log log = LogFactory.getLog(AuthenticatorBase.class);
 
 
     //------------------------------------------------------ Constructor
index 43381b6..b14032d 100644 (file)
@@ -47,7 +47,7 @@ import org.apache.tomcat.util.buf.MessageBytes;
 
 public class BasicAuthenticator
     extends AuthenticatorBase {
-    private static Log log = LogFactory.getLog(BasicAuthenticator.class);
+    private static final Log log = LogFactory.getLog(BasicAuthenticator.class);
 
 
 
index 10e4398..bef80fe 100644 (file)
@@ -49,7 +49,7 @@ import org.apache.juli.logging.LogFactory;
 
 public class DigestAuthenticator
     extends AuthenticatorBase {
-    private static Log log = LogFactory.getLog(DigestAuthenticator.class);
+    private static final Log log = LogFactory.getLog(DigestAuthenticator.class);
 
 
     // -------------------------------------------------------------- Constants
index b67c506..8f12842 100644 (file)
@@ -56,7 +56,7 @@ import org.apache.tomcat.util.http.MimeHeaders;
 public class FormAuthenticator
     extends AuthenticatorBase {
     
-    private static Log log = LogFactory.getLog(FormAuthenticator.class);
+    private static final Log log = LogFactory.getLog(FormAuthenticator.class);
 
     // ----------------------------------------------------- Instance Variables
 
index fe7be66..1a4571c 100644 (file)
@@ -56,7 +56,7 @@ import org.apache.tomcat.util.modeler.Registry;
 public class Connector
     implements Lifecycle, MBeanRegistration
 {
-    private static Log log = LogFactory.getLog(Connector.class);
+    private static final Log log = LogFactory.getLog(Connector.class);
 
 
     /**
index 16c1d42..026c129 100644 (file)
@@ -57,7 +57,7 @@ import org.apache.tomcat.util.net.SocketStatus;
 public class CoyoteAdapter
     implements Adapter 
  {
-    private static Log log = LogFactory.getLog(CoyoteAdapter.class);
+    private static final Log log = LogFactory.getLog(CoyoteAdapter.class);
 
     // -------------------------------------------------------------- Constants
 
index 089e29f..16343ec 100644 (file)
@@ -53,7 +53,7 @@ public class MapperListener
  {
 
 
-    private static Log log = LogFactory.getLog(MapperListener.class);
+    private static final Log log = LogFactory.getLog(MapperListener.class);
 
 
     // ----------------------------------------------------- Instance Variables
index 037ba8c..ac56174 100644 (file)
@@ -68,7 +68,7 @@ import org.apache.tomcat.util.res.StringManager;
 final class ApplicationDispatcher
     implements RequestDispatcher {
 
-    protected static Log log = LogFactory.getLog(ApplicationDispatcher.class);
+    protected static final Log log = LogFactory.getLog(ApplicationDispatcher.class);
 
     protected class PrivilegedForward
             implements PrivilegedExceptionAction<Void> {
index 6ea8f50..455018e 100644 (file)
@@ -44,7 +44,7 @@ import org.apache.tomcat.jni.Library;
 public class AprLifecycleListener
     implements LifecycleListener {
 
-    private static Log log = LogFactory.getLog(AprLifecycleListener.class);
+    private static final Log log = LogFactory.getLog(AprLifecycleListener.class);
 
     /**
      * The string manager for this package.
index aab357c..bfcf7ef 100644 (file)
@@ -51,7 +51,7 @@ public class AsyncContextImpl implements AsyncContext {
         NOT_STARTED, STARTED, DISPATCHING, DISPATCHED, COMPLETING, TIMING_OUT, ERROR_DISPATCHING
     }
     
-    protected static Log log = LogFactory.getLog(AsyncContextImpl.class);
+    protected static final Log log = LogFactory.getLog(AsyncContextImpl.class);
     
     private ServletRequest servletRequest = null;
     private ServletResponse servletResponse = null;
index 78d2c7d..255b683 100644 (file)
@@ -38,7 +38,7 @@ import org.apache.juli.logging.LogFactory;
 public class JasperListener
     implements LifecycleListener {
 
-    private static Log log = LogFactory.getLog(JasperListener.class);
+    private static final Log log = LogFactory.getLog(JasperListener.class);
 
     /**
      * The string manager for this package.
index 6d5c2f1..afadf80 100644 (file)
@@ -81,7 +81,7 @@ import org.apache.tomcat.util.modeler.Registry;
 public class NamingContextListener
     implements LifecycleListener, ContainerListener, PropertyChangeListener {
 
-    private static Log log = LogFactory.getLog(NamingContextListener.class);
+    private static final Log log = LogFactory.getLog(NamingContextListener.class);
 
 
     // ----------------------------------------------------- Instance Variables
index 7a1e27e..fbbe0ce 100644 (file)
@@ -117,7 +117,7 @@ public class StandardContext
     extends ContainerBase
     implements Context, NotificationEmitter
 {
-    private static Log log = LogFactory.getLog(StandardContext.class);
+    private static final Log log = LogFactory.getLog(StandardContext.class);
 
 
     // ----------------------------------------------------------- Constructors
index 07d9e0b..194785c 100644 (file)
@@ -53,7 +53,7 @@ public class StandardEngine
     extends ContainerBase
     implements Engine {
 
-    private static Log log = LogFactory.getLog(StandardEngine.class);
+    private static final Log log = LogFactory.getLog(StandardEngine.class);
 
     // ----------------------------------------------------------- Constructors
 
index f22b948..197d7b5 100644 (file)
@@ -57,7 +57,7 @@ final class StandardHostValve
     extends ValveBase {
 
 
-    private static Log log = LogFactory.getLog(StandardHostValve.class);
+    private static final Log log = LogFactory.getLog(StandardHostValve.class);
 
     //------------------------------------------------------ Constructor
     public StandardHostValve() {
index a6ab6dd..dc673e7 100644 (file)
@@ -55,7 +55,7 @@ public class StandardPipeline
     implements Pipeline, Contained, Lifecycle 
  {
 
-    private static Log log = LogFactory.getLog(StandardPipeline.class);
+    private static final Log log = LogFactory.getLog(StandardPipeline.class);
 
     // ----------------------------------------------------------- Constructors
 
index eac6cfa..d4ef06b 100644 (file)
@@ -60,7 +60,7 @@ import org.apache.tomcat.util.modeler.Registry;
 public final class StandardServer
     implements Lifecycle, Server, MBeanRegistration 
  {
-    private static Log log = LogFactory.getLog(StandardServer.class);
+    private static final Log log = LogFactory.getLog(StandardServer.class);
    
 
     // ------------------------------------------------------------ Constructor
index cf64364..c0cf3c7 100644 (file)
@@ -52,7 +52,7 @@ import org.apache.catalina.Executor;
 public class StandardService
         implements Lifecycle, Service, MBeanRegistration 
  {
-    private static Log log = LogFactory.getLog(StandardService.class);
+    private static final Log log = LogFactory.getLog(StandardService.class);
    
 
     // ----------------------------------------------------- Instance Variables
index ffb252d..7246900 100644 (file)
@@ -44,7 +44,7 @@ public final class RemoteAddrFilter
     extends RequestFilter {
 
     // ----------------------------------------------------- Instance Variables
-    private static Log log = LogFactory.getLog(RemoteAddrFilter.class);
+    private static final Log log = LogFactory.getLog(RemoteAddrFilter.class);
 
 
     // ------------------------------------------------------------- Properties
index 0b4c12d..1b78320 100644 (file)
@@ -45,7 +45,7 @@ public final class RemoteHostFilter
 
     
     // ----------------------------------------------------- Instance Variables
-    private static Log log = LogFactory.getLog(RemoteHostFilter.class);
+    private static final Log log = LogFactory.getLog(RemoteHostFilter.class);
 
 
     // ------------------------------------------------------------- Properties
index 7710feb..5a35847 100644 (file)
@@ -581,7 +581,7 @@ public class RemoteIpFilter implements Filter {
     /**
      * Logger
      */
-    private static Log log = LogFactory.getLog(RemoteIpFilter.class);
+    private static final Log log = LogFactory.getLog(RemoteIpFilter.class);
     
     protected static final String PROTOCOL_HEADER_PARAMETER = "protocolHeader";
     
index 3a4db03..23f15ec 100644 (file)
@@ -68,7 +68,7 @@ public class RequestDumperFilter implements Filter {
     /**
      * The logger for this class.
      */
-    private static Log log = LogFactory.getLog(RequestDumperFilter.class);
+    private static final Log log = LogFactory.getLog(RequestDumperFilter.class);
 
 
     /**
index 1ba3fe6..0b0d5eb 100644 (file)
@@ -36,7 +36,7 @@ import org.apache.juli.logging.LogFactory;
 public class HeartbeatListener
     implements LifecycleListener, ContainerListener {
 
-    private static Log log = LogFactory.getLog(HeartbeatListener.class);
+    private static final Log log = LogFactory.getLog(HeartbeatListener.class);
 
     /* To allow to select the connector */
     int port = 0;
index 63f51db..fee60f3 100644 (file)
@@ -33,7 +33,7 @@ import java.io.UnsupportedEncodingException;
 public class MultiCastSender
     implements Sender {
 
-    private static Log log = LogFactory.getLog(HeartbeatListener.class);
+    private static final Log log = LogFactory.getLog(HeartbeatListener.class);
 
     HeartbeatListener config = null;
 
index 06dab1e..8a1160f 100644 (file)
@@ -37,7 +37,7 @@ import java.util.StringTokenizer;
 public class TcpSender
     implements Sender {
 
-    private static Log log = LogFactory.getLog(HeartbeatListener.class);
+    private static final Log log = LogFactory.getLog(HeartbeatListener.class);
 
     HeartbeatListener config = null;
 
index cfcb149..2415019 100644 (file)
@@ -39,7 +39,7 @@ public class ClusterJmxHelper {
     
     protected static Registry registry = Registry.getRegistry(null,null);
     
-    protected static Log log = LogFactory.getLog(ClusterJmxHelper.class);
+    protected static final Log log = LogFactory.getLog(ClusterJmxHelper.class);
     
     protected static boolean jmxEnabled = true;
     
index 9ed5047..2c5c848 100644 (file)
@@ -76,7 +76,7 @@ public class SimpleTcpCluster
     implements CatalinaCluster, Lifecycle, LifecycleListener, IDynamicProperty,
                MembershipListener, ChannelListener{
 
-    public static Log log = LogFactory.getLog(SimpleTcpCluster.class);
+    public static final Log log = LogFactory.getLog(SimpleTcpCluster.class);
 
     // ----------------------------------------------------- Instance Variables
 
index 69015db..62cf94b 100644 (file)
@@ -49,7 +49,7 @@ import org.apache.tomcat.util.modeler.Registry;
 
 public class GlobalResourcesLifecycleListener
     implements LifecycleListener {
-    private static Log log = LogFactory.getLog(GlobalResourcesLifecycleListener.class);
+    private static final Log log = LogFactory.getLog(GlobalResourcesLifecycleListener.class);
 
     // ----------------------------------------------------- Instance Variables
 
index 80198dc..61a7c79 100644 (file)
@@ -52,7 +52,7 @@ import org.apache.juli.logging.LogFactory;
  */
 public class JmxRemoteLifecycleListener implements LifecycleListener {
     
-    private static Log log =
+    private static final Log log =
         LogFactory.getLog(JmxRemoteLifecycleListener.class);
     
     /**
index e9b8b76..09c6c01 100644 (file)
@@ -64,7 +64,7 @@ import org.apache.juli.logging.LogFactory;
 public class ServerLifecycleListener
     implements ContainerListener, LifecycleListener, PropertyChangeListener {
 
-    private static Log log = LogFactory.getLog(ServerLifecycleListener.class);
+    private static final Log log = LogFactory.getLog(ServerLifecycleListener.class);
 
 
     // ------------------------------------------------------------- Properties
index 998d9b0..fd5ed5b 100644 (file)
@@ -41,7 +41,7 @@ import org.apache.juli.logging.LogFactory;
  */
 public class CombinedRealm extends RealmBase {
 
-    private static Log log = LogFactory.getLog(CombinedRealm.class);
+    private static final Log log = LogFactory.getLog(CombinedRealm.class);
 
     /**
      * The string manager for this package.
index 2f094e4..6e71fc8 100644 (file)
@@ -79,7 +79,7 @@ import org.apache.tomcat.util.digester.Digester;
 public class JAASMemoryLoginModule extends MemoryRealm implements LoginModule {
     // We need to extend MemoryRealm to avoid class cast
 
-    private static Log log = LogFactory.getLog(JAASMemoryLoginModule.class);
+    private static final Log log = LogFactory.getLog(JAASMemoryLoginModule.class);
 
     // ----------------------------------------------------- Instance Variables
 
index 1037e21..3c0cc32 100644 (file)
@@ -128,7 +128,7 @@ org.foobar.auth.DatabaseLoginModule REQUIRED
 public class JAASRealm
     extends RealmBase
  {
-    private static Log log = LogFactory.getLog(JAASRealm.class);
+    private static final Log log = LogFactory.getLog(JAASRealm.class);
 
     // ----------------------------------------------------- Instance Variables
 
index f0cd11d..e0d925d 100644 (file)
@@ -41,7 +41,7 @@ import org.apache.juli.logging.LogFactory;
  */
 public class LockOutRealm extends CombinedRealm {
 
-    private static Log log = LogFactory.getLog(LockOutRealm.class);
+    private static final Log log = LogFactory.getLog(LockOutRealm.class);
 
     /**
      * The number of times in a row a user has to fail authentication to be
index 3d4987b..2be85e1 100644 (file)
@@ -47,7 +47,7 @@ import org.apache.tomcat.util.digester.Digester;
 
 public class MemoryRealm  extends RealmBase {
 
-    private static Log log = LogFactory.getLog(MemoryRealm.class);
+    private static final Log log = LogFactory.getLog(MemoryRealm.class);
 
     // ----------------------------------------------------- Instance Variables
 
index bb1d1b2..19c61c5 100644 (file)
@@ -72,7 +72,7 @@ import org.apache.tomcat.util.modeler.Registry;
 public abstract class RealmBase
     implements Lifecycle, Realm, MBeanRegistration {
 
-    private static Log log = LogFactory.getLog(RealmBase.class);
+    private static final Log log = LogFactory.getLog(RealmBase.class);
 
     // ----------------------------------------------------- Instance Variables
 
index 279b9f2..93a68f7 100644 (file)
@@ -54,7 +54,7 @@ public abstract class PersistentManagerBase
     extends ManagerBase
     implements Lifecycle, PropertyChangeListener {
 
-    private static Log log = LogFactory.getLog(PersistentManagerBase.class);
+    private static final Log log = LogFactory.getLog(PersistentManagerBase.class);
 
     // ---------------------------------------------------- Security Classes
 
index c5f5db0..3323f31 100644 (file)
@@ -52,7 +52,7 @@ import org.apache.juli.logging.LogFactory;
 
 public final class Bootstrap {
 
-    private static Log log = LogFactory.getLog(Bootstrap.class);
+    private static final Log log = LogFactory.getLog(Bootstrap.class);
     
     // -------------------------------------------------------------- Constants
 
index d10b1e4..4eba147 100644 (file)
@@ -51,7 +51,7 @@ import org.apache.juli.logging.LogFactory;
 public final class ClassLoaderFactory {
 
 
-    private static Log log = LogFactory.getLog(ClassLoaderFactory.class);
+    private static final Log log = LogFactory.getLog(ClassLoaderFactory.class);
 
     protected static final Integer IS_DIR = new Integer(0);
     protected static final Integer IS_JAR = new Integer(1);
index 37b69d4..a5c2836 100644 (file)
@@ -29,7 +29,7 @@ import org.apache.juli.logging.LogFactory;
 import java.lang.reflect.InvocationTargetException;
 public class ClusterRuleSetFactory {
     
-    public static Log log = LogFactory.getLog(ClusterRuleSetFactory.class);
+    public static final Log log = LogFactory.getLog(ClusterRuleSetFactory.class);
     
     public static RuleSetBase getClusterRuleSet(String prefix) {
         
index 05d3c02..9024536 100644 (file)
@@ -37,7 +37,7 @@ import org.apache.juli.logging.Log;
 
 public class ConnectorCreateRule extends Rule {
 
-    protected static Log log = LogFactory.getLog(ConnectorCreateRule.class);
+    protected static final Log log = LogFactory.getLog(ConnectorCreateRule.class);
     // --------------------------------------------------------- Public Methods
 
 
index 9349b8a..1e4f9b2 100644 (file)
@@ -102,7 +102,7 @@ import org.apache.tomcat.util.log.SystemLogHandler;
  */
 
 public class Embedded  extends StandardService {
-    private static Log log = LogFactory.getLog(Embedded.class);
+    private static final Log log = LogFactory.getLog(Embedded.class);
 
     // ----------------------------------------------------------- Constructors
 
index 7b36e46..70cd6d1 100644 (file)
@@ -47,7 +47,7 @@ import org.apache.juli.logging.LogFactory;
 
 public class ExpandWar {
 
-    private static Log log = LogFactory.getLog(ExpandWar.class);
+    private static final Log log = LogFactory.getLog(ExpandWar.class);
 
     /**
      * The string resources for this package.
index 6816bde..c72fa1d 100644 (file)
@@ -73,7 +73,7 @@ import org.apache.juli.logging.LogFactory;
 public final class Tool {
 
 
-    private static Log log = LogFactory.getLog(Tool.class);
+    private static final Log log = LogFactory.getLog(Tool.class);
     
     // ------------------------------------------------------- Static Variables
 
index bd236b9..c62075d 100644 (file)
@@ -27,7 +27,7 @@ import org.apache.juli.logging.LogFactory;
  * @version 1.0
  */
 public class BufferPool {
-    protected static Log log = LogFactory.getLog(BufferPool.class);
+    protected static final Log log = LogFactory.getLog(BufferPool.class);
 
     public static int DEFAULT_POOL_SIZE = 100*1024*1024; //100MB
 
index 028c0df..644a61d 100644 (file)
@@ -53,7 +53,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @version 1.0
  */
 public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements RpcCallback, ChannelListener, MembershipListener, Heartbeat {
-    protected static Log log = LogFactory.getLog(AbstractReplicatedMap.class);
+    protected static final Log log = LogFactory.getLog(AbstractReplicatedMap.class);
 
     /**
      * The default initial capacity - MUST be a power of two.
index a023ba8..6e61c54 100644 (file)
@@ -35,7 +35,7 @@ import java.util.StringTokenizer;
  * @version 1.0
  */
 public class Arrays {
-    protected static Log log = LogFactory.getLog(Arrays.class);
+    protected static final Log log = LogFactory.getLog(Arrays.class);
     
     public static boolean contains(byte[] source, int srcoffset, byte[] key, int keyoffset, int length) {
         if ( srcoffset < 0 || srcoffset >= source.length) throw new ArrayIndexOutOfBoundsException("srcoffset is out of bounds.");
index 9fae289..5f126d3 100644 (file)
@@ -52,7 +52,7 @@ import org.xml.sax.Attributes;
 public class MemoryUserDatabase implements UserDatabase {
 
 
-    private static Log log = LogFactory.getLog(MemoryUserDatabase.class);
+    private static final Log log = LogFactory.getLog(MemoryUserDatabase.class);
 
     // ----------------------------------------------------------- Constructors
 
index e4a3c6f..6f4c323 100644 (file)
@@ -123,7 +123,7 @@ public class AccessLogValve
     extends ValveBase
     implements Lifecycle {
 
-    private static Log log = LogFactory.getLog(AccessLogValve.class);
+    private static final Log log = LogFactory.getLog(AccessLogValve.class);
 
     //------------------------------------------------------ Constructor
     public AccessLogValve() {
index 28fedba..5908948 100644 (file)
@@ -133,7 +133,7 @@ public class ExtendedAccessLogValve
     extends AccessLogValve
     implements Lifecycle {
 
-    private static Log log = LogFactory.getLog(ExtendedAccessLogValve.class);
+    private static final Log log = LogFactory.getLog(ExtendedAccessLogValve.class);
 
     // ----------------------------------------------------- Instance Variables
 
index 5b49b22..6d2a31f 100644 (file)
@@ -347,7 +347,7 @@ public class RemoteIpValve extends ValveBase {
     /**
      * Logger
      */
-    private static Log log = LogFactory.getLog(RemoteIpValve.class);
+    private static final Log log = LogFactory.getLog(RemoteIpValve.class);
     
     /**
      * The StringManager for this package.
index a5f41fc..50ac2cd 100644 (file)
@@ -57,7 +57,7 @@ import org.apache.juli.logging.LogFactory;
 
 public abstract class ValveBase
     implements Contained, Valve, MBeanRegistration {
-    private static Log log = LogFactory.getLog(ValveBase.class);
+    private static final Log log = LogFactory.getLog(ValveBase.class);
 
     //------------------------------------------------------ Constructor
     
index 2f7e9b1..138b122 100644 (file)
@@ -42,7 +42,7 @@ import org.apache.juli.logging.LogFactory;
 public final class EmbeddedServletOptions implements Options {
     
     // Logger
-    private Log log = LogFactory.getLog(EmbeddedServletOptions.class);
+    private final Log log = LogFactory.getLog(EmbeddedServletOptions.class);
     
     private Properties settings = new Properties();
     
index 74ddc37..69cbe41 100644 (file)
@@ -97,7 +97,7 @@ public class JspC implements Options {
             "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93";
 
     // Logger
-    protected static Log log = LogFactory.getLog(JspC.class);
+    protected static final Log log = LogFactory.getLog(JspC.class);
 
     protected static final String SWITCH_VERBOSE = "-v";
     protected static final String SWITCH_HELP = "-help";
index 0c44a73..21eab7a 100644 (file)
@@ -44,7 +44,7 @@ public class JspConfig {
     private static final String WEB_XML = "/WEB-INF/web.xml";
 
     // Logger
-    private Log log = LogFactory.getLog(JspConfig.class);
+    private final Log log = LogFactory.getLog(JspConfig.class);
 
     private Vector<JspPropertyGroup> jspProperties = null;
     private ServletContext ctxt;
index 64d2f8d..b88e22e 100644 (file)
@@ -51,7 +51,7 @@ class JspReader {
     /**
      * Logger.
      */
-    private Log log = LogFactory.getLog(JspReader.class);
+    private final Log log = LogFactory.getLog(JspReader.class);
 
     /**
      * The current spot in the file.
index 5978ef5..c52955c 100644 (file)
@@ -58,7 +58,7 @@ import org.apache.juli.logging.LogFactory;
 public final class JspRuntimeContext {
 
     // Logger
-    private Log log = LogFactory.getLog(JspRuntimeContext.class);
+    private final Log log = LogFactory.getLog(JspRuntimeContext.class);
 
     /*
      * Counts how many times the webapp's JSPs have been reloaded.
index 2fc299a..0946e81 100644 (file)
@@ -65,7 +65,7 @@ import org.apache.juli.logging.LogFactory;
 class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants {
 
     // Logger
-    private Log log = LogFactory.getLog(TagLibraryInfoImpl.class);
+    private final Log log = LogFactory.getLog(TagLibraryInfoImpl.class);
 
     private JspCompilationContext ctxt;
     
index 167d900..aee1f44 100644 (file)
@@ -81,7 +81,7 @@ import org.apache.tomcat.JarScannerCallback;
 public class TldLocationsCache {
 
     // Logger
-    private Log log = LogFactory.getLog(TldLocationsCache.class);
+    private final Log log = LogFactory.getLog(TldLocationsCache.class);
 
     /**
      * The types of URI one may specify for a tag library
index 3378ae0..f9cbac4 100644 (file)
@@ -40,7 +40,7 @@ import org.apache.juli.logging.LogFactory;
 public class JspFactoryImpl extends JspFactory {
 
     // Logger
-    private Log log = LogFactory.getLog(JspFactoryImpl.class);
+    private final Log log = LogFactory.getLog(JspFactoryImpl.class);
 
     private static final String SPEC_VERSION = "2.1";
     private static final boolean USE_POOL = 
index 46fa7c8..2f5c27b 100644 (file)
@@ -38,7 +38,7 @@ public class TagHandlerPool {
     public static final String OPTION_TAGPOOL="tagpoolClassName";
     public static final String OPTION_MAXSIZE="tagpoolMaxSize";
 
-    private Log log = LogFactory.getLog(TagHandlerPool.class);
+    private final Log log = LogFactory.getLog(TagHandlerPool.class);
     
     // index of next available tag handler
     private int current;
index 862a8e4..5500f51 100644 (file)
@@ -58,7 +58,7 @@ import org.apache.tomcat.PeriodicEventListener;
 public class JspServlet extends HttpServlet implements PeriodicEventListener {
 
     // Logger
-    private Log log = LogFactory.getLog(JspServlet.class);
+    private final Log log = LogFactory.getLog(JspServlet.class);
 
     private ServletContext context;
     private ServletConfig config;
index 45d52e5..c421fbe 100644 (file)
@@ -65,7 +65,7 @@ import org.apache.tomcat.InstanceManager;
 public class JspServletWrapper {
 
     // Logger
-    private Log log = LogFactory.getLog(JspServletWrapper.class);
+    private final Log log = LogFactory.getLog(JspServletWrapper.class);
 
     private Servlet theServlet;
     private String jspUri;
index c61acdc..41cca6b 100644 (file)
@@ -41,7 +41,7 @@ public class GenericParser{
     /**
      * The Log to which all SAX event related logging calls will be made.
      */
-    protected static Log log =
+    protected static final Log log =
         LogFactory.getLog("org.apache.commons.digester.Digester.sax");
 
     /**
index a8a773c..cb10d76 100644 (file)
@@ -46,7 +46,7 @@ public class XercesParser{
     /**
      * The Log to which all SAX event related logging calls will be made.
      */
-    protected static Log log =
+    protected static final Log log =
         LogFactory.getLog("org.apache.commons.digester.Digester.sax");
 
 
index aef3bb0..de6b810 100644 (file)
@@ -101,7 +101,7 @@ import org.apache.juli.logging.LogFactory;
  * @author Costin Manolache
  */
 public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBeanNotificationBroadcaster {
-    private static Log log = LogFactory.getLog(BaseModelMBean.class);
+    private static final Log log = LogFactory.getLog(BaseModelMBean.class);
 
     // ----------------------------------------------------------- Constructors
 
index 13d02ac..93d72c1 100644 (file)
@@ -76,7 +76,7 @@ public class Registry implements RegistryMBean, MBeanRegistration  {
     /**
      * The Log instance to which we will write our log messages.
      */
-    private static Log log = LogFactory.getLog(Registry.class);
+    private static final Log log = LogFactory.getLog(Registry.class);
 
     // Support for the factory methods
     
index d183175..69878e7 100644 (file)
@@ -39,7 +39,7 @@ import org.w3c.dom.Node;
 
 public class MbeansDescriptorsDOMSource extends ModelerSource
 {
-    private static Log log = LogFactory.getLog(MbeansDescriptorsDOMSource.class);
+    private static final Log log = LogFactory.getLog(MbeansDescriptorsDOMSource.class);
 
     Registry registry;
     String location;
index be8a134..1f49c31 100644 (file)
@@ -34,7 +34,7 @@ import org.apache.juli.logging.LogFactory;
 
 public class MbeansDescriptorsDigesterSource extends ModelerSource
 {
-    private static Log log =
+    private static final Log log =
             LogFactory.getLog(MbeansDescriptorsDigesterSource.class);
 
     Registry registry;
index 048ab77..c5501c3 100644 (file)
@@ -38,7 +38,7 @@ import org.apache.tomcat.util.modeler.Registry;
 
 public class MbeansDescriptorsIntrospectionSource extends ModelerSource
 {
-    private static Log log = LogFactory.getLog(MbeansDescriptorsIntrospectionSource.class);
+    private static final Log log = LogFactory.getLog(MbeansDescriptorsIntrospectionSource.class);
 
     Registry registry;
     String location;
index 33eefd7..8d589d9 100644 (file)
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.modeler.Registry;
 
 public class MbeansDescriptorsSerSource extends ModelerSource
 {
-    private static Log log = LogFactory.getLog(MbeansDescriptorsSerSource.class);
+    private static final Log log = LogFactory.getLog(MbeansDescriptorsSerSource.class);
     Registry registry;
     String location;
     String type;
index a0d91d0..0345caa 100644 (file)
@@ -53,7 +53,7 @@ import org.w3c.dom.Node;
  */
 public class MbeansSource extends ModelerSource implements MbeansSourceMBean
 {
-    private static Log log = LogFactory.getLog(MbeansSource.class);
+    private static final Log log = LogFactory.getLog(MbeansSource.class);
     Registry registry;
     String type;
 
index fb79504..680eb0f 100644 (file)
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
  * @author Remy Maucherat
  */
 public abstract class AbstractEndpoint {
-    protected static Log log = LogFactory.getLog(AbstractEndpoint.class);
+    protected static final Log log = LogFactory.getLog(AbstractEndpoint.class);
     
     // -------------------------------------------------------------- Constants
     protected StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res");
index fbad6c9..6bdd687 100644 (file)
@@ -57,7 +57,7 @@ public class AprEndpoint extends AbstractEndpoint {
     // -------------------------------------------------------------- Constants
 
 
-    protected static Log log = LogFactory.getLog(AprEndpoint.class);
+    protected static final Log log = LogFactory.getLog(AprEndpoint.class);
 
 
     // ----------------------------------------------------------------- Fields
index fdbc2dd..1008c01 100644 (file)
@@ -49,7 +49,7 @@ public class JIoEndpoint extends AbstractEndpoint {
 
     // -------------------------------------------------------------- Constants
 
-    protected static Log log = LogFactory.getLog(JIoEndpoint.class);
+    protected static final Log log = LogFactory.getLog(JIoEndpoint.class);
 
     // ----------------------------------------------------------------- Fields
 
index 0305f80..eb13446 100644 (file)
@@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class NioBlockingSelector {
     
-    protected static Log log = LogFactory.getLog(NioBlockingSelector.class);
+    protected static final Log log = LogFactory.getLog(NioBlockingSelector.class);
     
     private static int threadCounter = 0;
     
index 21e10d9..7a9f22f 100644 (file)
@@ -77,7 +77,7 @@ public class NioEndpoint extends AbstractEndpoint {
     // -------------------------------------------------------------- Constants
 
 
-    protected static Log log = LogFactory.getLog(NioEndpoint.class);
+    protected static final Log log = LogFactory.getLog(NioEndpoint.class);
 
 
     public static final int OP_REGISTER = 0x100; //register interest op
index edb5598..3a7025d 100644 (file)
@@ -45,7 +45,7 @@ public class NioSelectorPool {
     
     protected static int threadCount = 0;
     
-    protected static Log log = LogFactory.getLog(NioSelectorPool.class);
+    protected static final Log log = LogFactory.getLog(NioSelectorPool.class);
 
     protected final static boolean SHARED =
         Boolean.valueOf(System.getProperty("org.apache.tomcat.util.net.NioSelectorShared", "true")).booleanValue();
index f0ce85b..9444502 100644 (file)
@@ -49,7 +49,7 @@ public class BayeuxServlet implements CometProcessor {
     /**
      * Logger object
      */
-    protected static Log log = LogFactory.getLog(BayeuxServlet.class);
+    protected static final Log log = LogFactory.getLog(BayeuxServlet.class);
 
     /**
      * Servlet config - for future use
index ec3fe40..d2e4d72 100644 (file)
@@ -34,7 +34,7 @@ import org.apache.juli.logging.LogFactory;
  */
 public class ChannelImpl implements Channel {
     
-    protected static Log log = LogFactory.getLog(ChannelImpl.class);
+    protected static final Log log = LogFactory.getLog(ChannelImpl.class);
     
     /**
      * The unique id of this channel
index b03f7a8..2bdfad4 100644 (file)
@@ -41,7 +41,7 @@ public class ClientImpl implements Client {
 
     public static final String COMET_EVENT_ATTR = "org.apache.cometd.bayeux.client";
     
-    protected static Log log = LogFactory.getLog(ClientImpl.class);
+    protected static final Log log = LogFactory.getLog(ClientImpl.class);
 
     protected static LinkedList<Message> EMPTY_LIST = new LinkedList<Message>();
     /**
index a813abf..20eb89a 100644 (file)
@@ -74,7 +74,7 @@ public abstract class RequestBase implements BayeuxRequest {
     
     protected HashMap<String, Object> response = null;
     
-    protected static Log log = LogFactory.getLog(RequestBase.class);
+    protected static final Log log = LogFactory.getLog(RequestBase.class);
     
     protected int reconnectInterval = 1000;
     
index 85be2f6..1e25d92 100644 (file)
@@ -58,7 +58,7 @@ public class ConnectionPool {
     /**
      * Logger
      */
-    protected static Log log = LogFactory.getLog(ConnectionPool.class);
+    protected static final Log log = LogFactory.getLog(ConnectionPool.class);
 
     //===============================================================================
     //         INSTANCE/QUICK ACCESS VARIABLE
index 2ca9eb5..fbfc005 100644 (file)
@@ -55,7 +55,7 @@ import org.apache.juli.logging.LogFactory;
  * @author Filip Hanik
  */
 public class DataSourceFactory implements ObjectFactory {
-    protected static Log log = LogFactory.getLog(DataSourceFactory.class);
+    protected static final Log log = LogFactory.getLog(DataSourceFactory.class);
 
     protected final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
     protected final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
index f355eb2..093dd70 100644 (file)
@@ -43,7 +43,7 @@ import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition;
  */
 
 public class DataSourceProxy implements PoolConfiguration {
-    protected static Log log = LogFactory.getLog(DataSourceProxy.class);
+    protected static final Log log = LogFactory.getLog(DataSourceProxy.class);
     
     protected volatile ConnectionPool pool = null;
     
index 8819bd4..6fad3a3 100644 (file)
@@ -33,7 +33,7 @@ import org.apache.juli.logging.LogFactory;
  *
  */
 public class PoolProperties implements PoolConfiguration {
-    protected static Log log = LogFactory.getLog(PoolProperties.class);
+    protected static final Log log = LogFactory.getLog(PoolProperties.class);
     
     protected static AtomicInteger poolCounter = new AtomicInteger(0);
     protected Properties dbProperties = new Properties();
index 167f1ae..ba8edbf 100644 (file)
@@ -38,7 +38,7 @@ public class PooledConnection {
     /**
      * Logger
      */
-    protected static Log log = LogFactory.getLog(PooledConnection.class);
+    protected static final Log log = LogFactory.getLog(PooledConnection.class);
     /**
      * Instance counter
      */
index e57784a..412885e 100644 (file)
@@ -37,7 +37,7 @@ import org.apache.tomcat.jdbc.pool.JdbcInterceptor;
  */
 public abstract class AbstractQueryReport extends AbstractCreateStatementInterceptor {
     //logger
-    protected static Log log = LogFactory.getLog(AbstractQueryReport.class);
+    protected static final Log log = LogFactory.getLog(AbstractQueryReport.class);
 
     /**
      * The threshold in milliseconds. If the query is faster than this, we don't measure it
index 5056778..d3041fd 100644 (file)
@@ -41,7 +41,7 @@ import org.apache.tomcat.jdbc.pool.PooledConnection;
  */
 
 public class ConnectionState extends JdbcInterceptor  {
-    protected static Log log = LogFactory.getLog(ConnectionState.class);
+    protected static final Log log = LogFactory.getLog(ConnectionState.class);
     
     protected final String[] readState = {"getAutoCommit","getTransactionIsolation","isReadOnly","getCatalog"};
     protected final String[] writeState = {"setAutoCommit","setTransactionIsolation","setReadOnly","setCatalog"};
index 94e72cc..a1b7361 100644 (file)
@@ -39,7 +39,7 @@ import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorProperty;
  */
 public class SlowQueryReport extends AbstractQueryReport  {
     //logger
-    protected static Log log = LogFactory.getLog(SlowQueryReport.class);
+    protected static final Log log = LogFactory.getLog(SlowQueryReport.class);
 
     /**
      * we will be keeping track of query stats on a per pool basis
index 5005ede..df021e4 100644 (file)
@@ -60,7 +60,7 @@ public class SlowQueryReportJmx extends SlowQueryReport implements NotificationE
 
     protected static CompositeType SLOW_QUERY_TYPE; 
         
-    protected static Log log = LogFactory.getLog(SlowQueryReportJmx.class);
+    protected static final Log log = LogFactory.getLog(SlowQueryReportJmx.class);
     
     
     protected static ConcurrentHashMap<String,SlowQueryReportJmxMBean> mbeans = 
index c643e57..717f4b0 100644 (file)
@@ -32,7 +32,7 @@ import org.apache.tomcat.jdbc.pool.PooledConnection;
  *
  */
 public class StatementFinalizer extends AbstractCreateStatementInterceptor {
-    protected static Log log = LogFactory.getLog(StatementFinalizer.class);
+    protected static final Log log = LogFactory.getLog(StatementFinalizer.class);
     
     protected ArrayList<WeakReference<Statement>> statements = new ArrayList<WeakReference<Statement>>();
     
index 07af7f4..fbfb21b 100644 (file)
@@ -35,7 +35,7 @@ public class ConnectionPool extends NotificationBroadcasterSupport implements Co
     /**
      * logger
      */
-    protected static Log log = LogFactory.getLog(ConnectionPool.class);
+    protected static final Log log = LogFactory.getLog(ConnectionPool.class);
 
     /**
      * the connection pool
index 462dd1c..40ec614 100644 (file)
@@ -41,7 +41,7 @@ import org.apache.juli.logging.LogFactory;
  * @version 1.0
  */
 public class LoadTest implements MembershipListener,ChannelListener, Runnable {
-    protected static Log log = LogFactory.getLog(LoadTest.class);
+    protected static final Log log = LogFactory.getLog(LoadTest.class);
     public static int size = 24000;
     public static Object mutex = new Object();
     public boolean doRun = true;
index 9ad05b5..f43cfc5 100644 (file)
@@ -28,7 +28,7 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 public class Async0 extends HttpServlet {
-    protected static Log log = LogFactory.getLog(Async0.class);
+    protected static final Log log = LogFactory.getLog(Async0.class);
     public Async0() {
     }
 
index b8fbc40..ed3f539 100644 (file)
@@ -28,7 +28,7 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 public class Async1 extends HttpServlet {
-    protected static Log log = LogFactory.getLog(Async1.class);
+    protected static final Log log = LogFactory.getLog(Async1.class);
     public Async1() {
     }
 
index 874fe42..99435a0 100644 (file)
@@ -28,7 +28,7 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 public class Async2 extends HttpServlet {
-    protected static Log log = LogFactory.getLog(Async2.class);
+    protected static final Log log = LogFactory.getLog(Async2.class);
     public Async2() {
     }
 
index c4a8596..51dae86 100644 (file)
@@ -28,7 +28,7 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 
 public class Async3 extends HttpServlet {
-    protected static Log log = LogFactory.getLog(Async3.class);
+    protected static final Log log = LogFactory.getLog(Async3.class);
     public Async3() {
     }