From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 9 Nov 2009 20:51:17 +0000 (+0000)
Subject: Loggers should be final
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=067e3633919855bb1cfb11bd340784c4d3b014e6;p=tomcat7.0

Loggers should be final

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834226 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index f85e39b5c..a84bfaae7 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -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
diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
index 43381b652..b14032d20 100644
--- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
@@ -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);
 
 
 
diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
index 10e4398fa..bef80fe43 100644
--- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
@@ -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
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index b67c50632..8f12842b4 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -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
 
diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java
index fe7be66f1..1a4571c2a 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -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);
 
 
     /**
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 16c1d4235..026c129c5 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -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
 
diff --git a/java/org/apache/catalina/connector/MapperListener.java b/java/org/apache/catalina/connector/MapperListener.java
index 089e29f41..16343ec1d 100644
--- a/java/org/apache/catalina/connector/MapperListener.java
+++ b/java/org/apache/catalina/connector/MapperListener.java
@@ -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
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 037ba8c3f..ac561749e 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -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> {
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index 6ea8f508b..455018ebf 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -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.
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java b/java/org/apache/catalina/core/AsyncContextImpl.java
index aab357ce0..bfcf7ef7e 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -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;
diff --git a/java/org/apache/catalina/core/JasperListener.java b/java/org/apache/catalina/core/JasperListener.java
index 78d2c7de5..255b683e7 100644
--- a/java/org/apache/catalina/core/JasperListener.java
+++ b/java/org/apache/catalina/core/JasperListener.java
@@ -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.
diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java
index 6d5c2f137..afadf8032 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -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
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 7a1e27e45..fbbe0cef7 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -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
diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java
index 07d9e0b86..194785c59 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -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
 
diff --git a/java/org/apache/catalina/core/StandardHostValve.java b/java/org/apache/catalina/core/StandardHostValve.java
index f22b9486b..197d7b5e8 100644
--- a/java/org/apache/catalina/core/StandardHostValve.java
+++ b/java/org/apache/catalina/core/StandardHostValve.java
@@ -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() {
diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java
index a6ab6ddf8..dc673e7db 100644
--- a/java/org/apache/catalina/core/StandardPipeline.java
+++ b/java/org/apache/catalina/core/StandardPipeline.java
@@ -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
 
diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java
index eac6cfa91..d4ef06b03 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -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
diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index cf6436469..c0cf3c7fd 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -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
diff --git a/java/org/apache/catalina/filters/RemoteAddrFilter.java b/java/org/apache/catalina/filters/RemoteAddrFilter.java
index ffb252d72..724690047 100644
--- a/java/org/apache/catalina/filters/RemoteAddrFilter.java
+++ b/java/org/apache/catalina/filters/RemoteAddrFilter.java
@@ -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
diff --git a/java/org/apache/catalina/filters/RemoteHostFilter.java b/java/org/apache/catalina/filters/RemoteHostFilter.java
index 0b4c12d47..1b783204f 100644
--- a/java/org/apache/catalina/filters/RemoteHostFilter.java
+++ b/java/org/apache/catalina/filters/RemoteHostFilter.java
@@ -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
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 7710febf9..5a358473e 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -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";
     
diff --git a/java/org/apache/catalina/filters/RequestDumperFilter.java b/java/org/apache/catalina/filters/RequestDumperFilter.java
index 3a4db03ac..23f15ec76 100644
--- a/java/org/apache/catalina/filters/RequestDumperFilter.java
+++ b/java/org/apache/catalina/filters/RequestDumperFilter.java
@@ -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);
 
 
     /**
diff --git a/java/org/apache/catalina/ha/backend/HeartbeatListener.java b/java/org/apache/catalina/ha/backend/HeartbeatListener.java
index 1ba3fe6c8..0b0d5eb8d 100644
--- a/java/org/apache/catalina/ha/backend/HeartbeatListener.java
+++ b/java/org/apache/catalina/ha/backend/HeartbeatListener.java
@@ -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;
diff --git a/java/org/apache/catalina/ha/backend/MultiCastSender.java b/java/org/apache/catalina/ha/backend/MultiCastSender.java
index 63f51dbe6..fee60f34d 100644
--- a/java/org/apache/catalina/ha/backend/MultiCastSender.java
+++ b/java/org/apache/catalina/ha/backend/MultiCastSender.java
@@ -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;
 
diff --git a/java/org/apache/catalina/ha/backend/TcpSender.java b/java/org/apache/catalina/ha/backend/TcpSender.java
index 06dab1ec0..8a1160fe9 100644
--- a/java/org/apache/catalina/ha/backend/TcpSender.java
+++ b/java/org/apache/catalina/ha/backend/TcpSender.java
@@ -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;
 
diff --git a/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java b/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
index cfcb1493d..24150192f 100644
--- a/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
+++ b/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
@@ -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;
     
diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
index 9ed50478d..2c5c848bb 100644
--- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
+++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
@@ -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
 
diff --git a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
index 69015db0f..62cf94b26 100644
--- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
@@ -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
 
diff --git a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
index 80198dc5f..61a7c79a4 100644
--- a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
@@ -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);
     
     /**
diff --git a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
index e9b8b76d2..09c6c01c9 100644
--- a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
@@ -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
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java b/java/org/apache/catalina/realm/CombinedRealm.java
index 998d9b0bc..fd5ed5b1e 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -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.
diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
index 2f094e4c1..6e71fc83a 100644
--- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
+++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
@@ -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
 
diff --git a/java/org/apache/catalina/realm/JAASRealm.java b/java/org/apache/catalina/realm/JAASRealm.java
index 1037e2139..3c0cc32ae 100644
--- a/java/org/apache/catalina/realm/JAASRealm.java
+++ b/java/org/apache/catalina/realm/JAASRealm.java
@@ -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
 
diff --git a/java/org/apache/catalina/realm/LockOutRealm.java b/java/org/apache/catalina/realm/LockOutRealm.java
index f0cd11df0..e0d925d41 100644
--- a/java/org/apache/catalina/realm/LockOutRealm.java
+++ b/java/org/apache/catalina/realm/LockOutRealm.java
@@ -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
diff --git a/java/org/apache/catalina/realm/MemoryRealm.java b/java/org/apache/catalina/realm/MemoryRealm.java
index 3d4987b28..2be85e1b5 100644
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -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
 
diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java
index bb1d1b239..19c61c589 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -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
 
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java
index 279b9f281..93a68f7b0 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -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
 
diff --git a/java/org/apache/catalina/startup/Bootstrap.java b/java/org/apache/catalina/startup/Bootstrap.java
index c5f5db009..3323f3159 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -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
 
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java b/java/org/apache/catalina/startup/ClassLoaderFactory.java
index d10b1e42e..4eba147db 100644
--- a/java/org/apache/catalina/startup/ClassLoaderFactory.java
+++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -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);
diff --git a/java/org/apache/catalina/startup/ClusterRuleSetFactory.java b/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
index 37b69d408..a5c283684 100644
--- a/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
+++ b/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
@@ -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) {
         
diff --git a/java/org/apache/catalina/startup/ConnectorCreateRule.java b/java/org/apache/catalina/startup/ConnectorCreateRule.java
index 05d3c0214..902453658 100644
--- a/java/org/apache/catalina/startup/ConnectorCreateRule.java
+++ b/java/org/apache/catalina/startup/ConnectorCreateRule.java
@@ -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
 
 
diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java
index 9349b8aae..1e4f9b288 100644
--- a/java/org/apache/catalina/startup/Embedded.java
+++ b/java/org/apache/catalina/startup/Embedded.java
@@ -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
 
diff --git a/java/org/apache/catalina/startup/ExpandWar.java b/java/org/apache/catalina/startup/ExpandWar.java
index 7b36e462a..70cd6d181 100644
--- a/java/org/apache/catalina/startup/ExpandWar.java
+++ b/java/org/apache/catalina/startup/ExpandWar.java
@@ -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.
diff --git a/java/org/apache/catalina/startup/Tool.java b/java/org/apache/catalina/startup/Tool.java
index 6816bde4c..c72fa1d21 100644
--- a/java/org/apache/catalina/startup/Tool.java
+++ b/java/org/apache/catalina/startup/Tool.java
@@ -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
 
diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java b/java/org/apache/catalina/tribes/io/BufferPool.java
index bd236b92c..c62075da9 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -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
 
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 028c0df42..644a61d0b 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -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.
diff --git a/java/org/apache/catalina/tribes/util/Arrays.java b/java/org/apache/catalina/tribes/util/Arrays.java
index a023ba851..6e61c54a1 100644
--- a/java/org/apache/catalina/tribes/util/Arrays.java
+++ b/java/org/apache/catalina/tribes/util/Arrays.java
@@ -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.");
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 9fae2894b..5f126d3f6 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -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
 
diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java
index e4a3c6f40..6f4c3230a 100644
--- a/java/org/apache/catalina/valves/AccessLogValve.java
+++ b/java/org/apache/catalina/valves/AccessLogValve.java
@@ -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() {
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 28fedba74..590894842 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -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
 
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java
index 5b49b227a..6d2a31f58 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -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.
diff --git a/java/org/apache/catalina/valves/ValveBase.java b/java/org/apache/catalina/valves/ValveBase.java
index a5f41fc25..50ac2cd7a 100644
--- a/java/org/apache/catalina/valves/ValveBase.java
+++ b/java/org/apache/catalina/valves/ValveBase.java
@@ -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
     
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java
index 2f7e9b171..138b1229c 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -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();
     
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index 74ddc3757..69cbe412d 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -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";
diff --git a/java/org/apache/jasper/compiler/JspConfig.java b/java/org/apache/jasper/compiler/JspConfig.java
index 0c44a737e..21eab7ae6 100644
--- a/java/org/apache/jasper/compiler/JspConfig.java
+++ b/java/org/apache/jasper/compiler/JspConfig.java
@@ -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;
diff --git a/java/org/apache/jasper/compiler/JspReader.java b/java/org/apache/jasper/compiler/JspReader.java
index 64d2f8d7b..b88e22e9b 100644
--- a/java/org/apache/jasper/compiler/JspReader.java
+++ b/java/org/apache/jasper/compiler/JspReader.java
@@ -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.
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index 5978ef52e..c52955c1e 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -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.
diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
index 2fc299af7..0946e81bb 100644
--- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
+++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
@@ -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;
     
diff --git a/java/org/apache/jasper/compiler/TldLocationsCache.java b/java/org/apache/jasper/compiler/TldLocationsCache.java
index 167d90070..aee1f4455 100644
--- a/java/org/apache/jasper/compiler/TldLocationsCache.java
+++ b/java/org/apache/jasper/compiler/TldLocationsCache.java
@@ -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
diff --git a/java/org/apache/jasper/runtime/JspFactoryImpl.java b/java/org/apache/jasper/runtime/JspFactoryImpl.java
index 3378ae004..f9cbac45e 100644
--- a/java/org/apache/jasper/runtime/JspFactoryImpl.java
+++ b/java/org/apache/jasper/runtime/JspFactoryImpl.java
@@ -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 = 
diff --git a/java/org/apache/jasper/runtime/TagHandlerPool.java b/java/org/apache/jasper/runtime/TagHandlerPool.java
index 46fa7c827..2f5c27ba4 100644
--- a/java/org/apache/jasper/runtime/TagHandlerPool.java
+++ b/java/org/apache/jasper/runtime/TagHandlerPool.java
@@ -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;
diff --git a/java/org/apache/jasper/servlet/JspServlet.java b/java/org/apache/jasper/servlet/JspServlet.java
index 862a8e4ce..5500f5134 100644
--- a/java/org/apache/jasper/servlet/JspServlet.java
+++ b/java/org/apache/jasper/servlet/JspServlet.java
@@ -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;
diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java
index 45d52e5b1..c421fbebc 100644
--- a/java/org/apache/jasper/servlet/JspServletWrapper.java
+++ b/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -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;
diff --git a/java/org/apache/tomcat/util/digester/GenericParser.java b/java/org/apache/tomcat/util/digester/GenericParser.java
index c61acdcdd..41cca6b81 100644
--- a/java/org/apache/tomcat/util/digester/GenericParser.java
+++ b/java/org/apache/tomcat/util/digester/GenericParser.java
@@ -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");
 
     /**
diff --git a/java/org/apache/tomcat/util/digester/XercesParser.java b/java/org/apache/tomcat/util/digester/XercesParser.java
index a8a773c5f..cb10d7696 100644
--- a/java/org/apache/tomcat/util/digester/XercesParser.java
+++ b/java/org/apache/tomcat/util/digester/XercesParser.java
@@ -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");
 
 
diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
index aef3bb0ea..de6b81073 100644
--- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
+++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
@@ -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
 
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java
index 13d02ac1f..93d72c1da 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -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
     
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
index d183175bb..69878e765 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
@@ -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;
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
index be8a134bb..1f49c3102 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
@@ -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;
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index 048ab7774..c5501c34e 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -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;
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
index 33eefd721..8d589d95b 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
@@ -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;
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
index a0d91d052..0345caadb 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
@@ -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;
 
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index fb79504f7..680eb0f6a 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -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");
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index fbad6c9ec..6bdd68784 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -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
diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index fdbc2ddaa..1008c01bb 100644
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -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
 
diff --git a/java/org/apache/tomcat/util/net/NioBlockingSelector.java b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
index 0305f80f6..eb134465b 100644
--- a/java/org/apache/tomcat/util/net/NioBlockingSelector.java
+++ b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
@@ -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;
     
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 21e10d99c..7a9f22f25 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -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
diff --git a/java/org/apache/tomcat/util/net/NioSelectorPool.java b/java/org/apache/tomcat/util/net/NioSelectorPool.java
index edb55985d..3a7025dee 100644
--- a/java/org/apache/tomcat/util/net/NioSelectorPool.java
+++ b/java/org/apache/tomcat/util/net/NioSelectorPool.java
@@ -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();
diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java b/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
index f0ce85b0f..944450225 100644
--- a/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
+++ b/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
@@ -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
diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java b/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java
index ec3fe4074..d2e4d72cc 100644
--- a/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java
+++ b/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java
@@ -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
diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java b/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
index b03f7a853..2bdfad4f9 100644
--- a/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
+++ b/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
@@ -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>();
     /**
diff --git a/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java b/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
index a813abf21..20eb89a51 100644
--- a/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
+++ b/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
@@ -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;
     
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
index 85be2f675..1e25d926e 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
@@ -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
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index 2ca9eb508..fbfc005a1 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -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";
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
index f355eb2a0..093dd707a 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
@@ -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;
     
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
index 8819bd4c5..6fad3a379 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
@@ -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();
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
index 167f1ae2c..ba8edbf21 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
@@ -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
      */
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
index e57784ad5..412885e01 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
@@ -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
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
index 50567784f..d3041fd29 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
@@ -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"};
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
index 94e72cc3e..a1b73617e 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
@@ -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
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
index 5005ede2e..df021e431 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
@@ -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 = 
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
index c643e5790..717f4b065 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
@@ -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>>();
     
diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
index 07af7f4d9..fbfb21b8c 100644
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
@@ -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
diff --git a/test/org/apache/catalina/tribes/demos/LoadTest.java b/test/org/apache/catalina/tribes/demos/LoadTest.java
index 462dd1c9a..40ec6146b 100644
--- a/test/org/apache/catalina/tribes/demos/LoadTest.java
+++ b/test/org/apache/catalina/tribes/demos/LoadTest.java
@@ -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;
diff --git a/webapps/examples/WEB-INF/classes/async/Async0.java b/webapps/examples/WEB-INF/classes/async/Async0.java
index 9ad05b5d0..f43cfc521 100644
--- a/webapps/examples/WEB-INF/classes/async/Async0.java
+++ b/webapps/examples/WEB-INF/classes/async/Async0.java
@@ -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() {
     }
 
diff --git a/webapps/examples/WEB-INF/classes/async/Async1.java b/webapps/examples/WEB-INF/classes/async/Async1.java
index b8fbc4029..ed3f539d5 100644
--- a/webapps/examples/WEB-INF/classes/async/Async1.java
+++ b/webapps/examples/WEB-INF/classes/async/Async1.java
@@ -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() {
     }
 
diff --git a/webapps/examples/WEB-INF/classes/async/Async2.java b/webapps/examples/WEB-INF/classes/async/Async2.java
index 874fe4262..99435a0b1 100644
--- a/webapps/examples/WEB-INF/classes/async/Async2.java
+++ b/webapps/examples/WEB-INF/classes/async/Async2.java
@@ -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() {
     }
 
diff --git a/webapps/examples/WEB-INF/classes/async/Async3.java b/webapps/examples/WEB-INF/classes/async/Async3.java
index c4a85963f..51dae8670 100644
--- a/webapps/examples/WEB-INF/classes/async/Async3.java
+++ b/webapps/examples/WEB-INF/classes/async/Async3.java
@@ -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() {
     }