From 8b7d9ad3eeddb311ba4182ce78a00020e5c16164 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 9 Nov 2009 21:00:22 +0000
Subject: [PATCH] StringManagers should be final

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834229 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/authenticator/SingleSignOn.java       | 2 +-
 java/org/apache/catalina/connector/CometEventImpl.java         | 2 +-
 java/org/apache/catalina/connector/InputBuffer.java            | 2 +-
 java/org/apache/catalina/connector/Request.java                | 2 +-
 java/org/apache/catalina/connector/RequestFacade.java          | 2 +-
 java/org/apache/catalina/connector/Response.java               | 2 +-
 java/org/apache/catalina/connector/ResponseFacade.java         | 2 +-
 java/org/apache/catalina/core/ApplicationFilterConfig.java     | 2 +-
 java/org/apache/catalina/core/ApplicationHttpRequest.java      | 2 +-
 java/org/apache/catalina/core/ApplicationHttpResponse.java     | 2 +-
 java/org/apache/catalina/core/ApplicationRequest.java          | 2 +-
 java/org/apache/catalina/core/ApplicationResponse.java         | 2 +-
 java/org/apache/catalina/core/AprLifecycleListener.java        | 2 +-
 java/org/apache/catalina/core/ContainerBase.java               | 2 +-
 java/org/apache/catalina/core/NamingContextListener.java       | 2 +-
 java/org/apache/catalina/core/StandardPipeline.java            | 2 +-
 java/org/apache/catalina/ha/session/DeltaManager.java          | 2 +-
 java/org/apache/catalina/ha/session/DeltaRequest.java          | 2 +-
 java/org/apache/catalina/ha/session/DeltaSession.java          | 2 +-
 java/org/apache/catalina/ha/session/SerializablePrincipal.java | 2 +-
 java/org/apache/catalina/ha/tcp/ReplicationValve.java          | 2 +-
 java/org/apache/catalina/manager/ManagerServlet.java           | 2 +-
 java/org/apache/catalina/manager/StatusManagerServlet.java     | 2 +-
 java/org/apache/catalina/manager/host/HostManagerServlet.java  | 2 +-
 java/org/apache/catalina/realm/CombinedRealm.java              | 2 +-
 java/org/apache/catalina/realm/JAASMemoryLoginModule.java      | 2 +-
 java/org/apache/catalina/realm/MemoryRealm.java                | 2 +-
 java/org/apache/catalina/realm/RealmBase.java                  | 2 +-
 java/org/apache/catalina/realm/UserDatabaseRealm.java          | 2 +-
 java/org/apache/catalina/servlets/DefaultServlet.java          | 2 +-
 java/org/apache/catalina/session/ManagerBase.java              | 2 +-
 java/org/apache/catalina/session/StandardSession.java          | 2 +-
 java/org/apache/catalina/startup/Embedded.java                 | 2 +-
 java/org/apache/catalina/tribes/transport/bio/BioSender.java   | 2 +-
 java/org/apache/catalina/tribes/util/StringManager.java        | 2 +-
 java/org/apache/catalina/users/MemoryUserDatabase.java         | 2 +-
 java/org/apache/catalina/util/ExtensionValidator.java          | 2 +-
 java/org/apache/catalina/util/HexUtils.java                    | 2 +-
 java/org/apache/catalina/valves/ErrorReportValve.java          | 2 +-
 java/org/apache/catalina/valves/RemoteIpValve.java             | 2 +-
 java/org/apache/catalina/valves/RequestFilterValve.java        | 2 +-
 java/org/apache/catalina/valves/ValveBase.java                 | 2 +-
 java/org/apache/coyote/ajp/AjpAprProcessor.java                | 2 +-
 java/org/apache/coyote/ajp/AjpAprProtocol.java                 | 2 +-
 java/org/apache/coyote/ajp/AjpMessage.java                     | 2 +-
 java/org/apache/coyote/ajp/AjpProcessor.java                   | 2 +-
 java/org/apache/coyote/ajp/AjpProtocol.java                    | 2 +-
 java/org/apache/coyote/http11/AbstractHttp11Processor.java     | 2 +-
 java/org/apache/coyote/http11/AbstractInputBuffer.java         | 2 +-
 java/org/apache/coyote/http11/AbstractOutputBuffer.java        | 2 +-
 java/org/apache/coyote/http11/Http11AprProcessor.java          | 2 +-
 java/org/apache/coyote/http11/Http11AprProtocol.java           | 2 +-
 java/org/apache/coyote/http11/Http11NioProtocol.java           | 2 +-
 java/org/apache/coyote/http11/Http11Protocol.java              | 2 +-
 java/org/apache/coyote/http11/InternalAprInputBuffer.java      | 2 +-
 java/org/apache/coyote/http11/InternalAprOutputBuffer.java     | 2 +-
 java/org/apache/naming/ContextBindings.java                    | 2 +-
 java/org/apache/naming/StringManager.java                      | 2 +-
 java/org/apache/tomcat/util/http/HttpMessages.java             | 2 +-
 java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java    | 2 +-
 java/org/apache/tomcat/util/res/StringManager.java             | 2 +-
 modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java   | 2 +-
 62 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java b/java/org/apache/catalina/authenticator/SingleSignOn.java
index ea0805bb1..6a4d6ce33 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -111,7 +111,7 @@ public class SingleSignOn
     /**
      * The string manager for this package.
      */
-    protected final static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/connector/CometEventImpl.java b/java/org/apache/catalina/connector/CometEventImpl.java
index 051d56667..10951362b 100644
--- a/java/org/apache/catalina/connector/CometEventImpl.java
+++ b/java/org/apache/catalina/connector/CometEventImpl.java
@@ -33,7 +33,7 @@ public class CometEventImpl implements CometEvent {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/connector/InputBuffer.java b/java/org/apache/catalina/connector/InputBuffer.java
index 62ae69546..8f07428b0 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -48,7 +48,7 @@ public class InputBuffer extends Reader
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index 32de3d2cb..ed003ce01 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -145,7 +145,7 @@ public class Request
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/connector/RequestFacade.java b/java/org/apache/catalina/connector/RequestFacade.java
index 3d8cad8d4..b9bd19276 100644
--- a/java/org/apache/catalina/connector/RequestFacade.java
+++ b/java/org/apache/catalina/connector/RequestFacade.java
@@ -235,7 +235,7 @@ public class RequestFacade implements HttpServletRequest {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java
index d951e0534..be0021509 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -93,7 +93,7 @@ public class Response
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/connector/ResponseFacade.java b/java/org/apache/catalina/connector/ResponseFacade.java
index 159ea2450..0083acfa0 100644
--- a/java/org/apache/catalina/connector/ResponseFacade.java
+++ b/java/org/apache/catalina/connector/ResponseFacade.java
@@ -108,7 +108,7 @@ public class ResponseFacade
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index a61d52f1a..fabeaec71 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -58,7 +58,7 @@ import org.apache.tomcat.util.modeler.Registry;
 public final class ApplicationFilterConfig implements FilterConfig, Serializable {
 
 
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     private static org.apache.juli.logging.Log log =
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 7bccc5096..07eb79377 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -79,7 +79,7 @@ class ApplicationHttpRequest extends HttpServletRequestWrapper {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/core/ApplicationHttpResponse.java b/java/org/apache/catalina/core/ApplicationHttpResponse.java
index 2af99e7be..6ef81647c 100644
--- a/java/org/apache/catalina/core/ApplicationHttpResponse.java
+++ b/java/org/apache/catalina/core/ApplicationHttpResponse.java
@@ -99,7 +99,7 @@ class ApplicationHttpResponse extends HttpServletResponseWrapper {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/core/ApplicationRequest.java b/java/org/apache/catalina/core/ApplicationRequest.java
index c46ab2e48..7775706c2 100644
--- a/java/org/apache/catalina/core/ApplicationRequest.java
+++ b/java/org/apache/catalina/core/ApplicationRequest.java
@@ -93,7 +93,7 @@ class ApplicationRequest extends ServletRequestWrapper {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/core/ApplicationResponse.java b/java/org/apache/catalina/core/ApplicationResponse.java
index 2267d8555..845972dec 100644
--- a/java/org/apache/catalina/core/ApplicationResponse.java
+++ b/java/org/apache/catalina/core/ApplicationResponse.java
@@ -89,7 +89,7 @@ class ApplicationResponse extends ServletResponseWrapper {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index 455018ebf..1593e8529 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -49,7 +49,7 @@ public class AprLifecycleListener
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index 67beb7f08..6353e08cb 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -247,7 +247,7 @@ public abstract class ContainerBase
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java
index afadf8032..1007e43e3 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -142,7 +142,7 @@ public class NamingContextListener
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java
index dc673e7db..63916009e 100644
--- a/java/org/apache/catalina/core/StandardPipeline.java
+++ b/java/org/apache/catalina/core/StandardPipeline.java
@@ -114,7 +114,7 @@ public class StandardPipeline
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java b/java/org/apache/catalina/ha/session/DeltaManager.java
index 98ff509ae..7de03b8ee 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -73,7 +73,7 @@ public class DeltaManager extends ClusterManagerBase{
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(Constants.Package);
 
     // ----------------------------------------------------- Instance Variables
 
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java b/java/org/apache/catalina/ha/session/DeltaRequest.java
index e9d4e3f3a..3fa274e7f 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -46,7 +46,7 @@ public class DeltaRequest implements Externalizable {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm = StringManager
+    protected static final StringManager sm = StringManager
             .getManager(Constants.Package);
 
     public static final int TYPE_ATTRIBUTE = 0;
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java b/java/org/apache/catalina/ha/session/DeltaSession.java
index 4a9c573bc..6f9e98619 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -67,7 +67,7 @@ public class DeltaSession extends StandardSession implements Externalizable,Clus
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(Constants.Package);
 
     // ----------------------------------------------------- Instance Variables
 
diff --git a/java/org/apache/catalina/ha/session/SerializablePrincipal.java b/java/org/apache/catalina/ha/session/SerializablePrincipal.java
index a32b1b4d9..a7be80ab6 100644
--- a/java/org/apache/catalina/ha/session/SerializablePrincipal.java
+++ b/java/org/apache/catalina/ha/session/SerializablePrincipal.java
@@ -50,7 +50,7 @@ public class SerializablePrincipal  implements java.io.Serializable {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     // ----------------------------------------------------------- Constructors
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 33e41468f..f3491b5f9 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -78,7 +78,7 @@ public class ReplicationValve
     /**
      * The StringManager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     private CatalinaCluster cluster = null ;
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java
index 413935e6e..8ca230194 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -233,7 +233,7 @@ public class ManagerServlet
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java b/java/org/apache/catalina/manager/StatusManagerServlet.java
index a1fcec1b4..7336ba148 100644
--- a/java/org/apache/catalina/manager/StatusManagerServlet.java
+++ b/java/org/apache/catalina/manager/StatusManagerServlet.java
@@ -88,7 +88,7 @@ public class StatusManagerServlet
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index 4bff73c0d..9b6e0f08e 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -138,7 +138,7 @@ public class HostManagerServlet
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/realm/CombinedRealm.java b/java/org/apache/catalina/realm/CombinedRealm.java
index fd5ed5b1e..6b1c4392c 100644
--- a/java/org/apache/catalina/realm/CombinedRealm.java
+++ b/java/org/apache/catalina/realm/CombinedRealm.java
@@ -46,7 +46,7 @@ public class CombinedRealm extends RealmBase {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
     
     /**
diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
index 6e71fc83a..0ba939e9b 100644
--- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
+++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
@@ -118,7 +118,7 @@ public class JAASMemoryLoginModule extends MemoryRealm implements LoginModule {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     /**
diff --git a/java/org/apache/catalina/realm/MemoryRealm.java b/java/org/apache/catalina/realm/MemoryRealm.java
index 2be85e1b5..0ba1147aa 100644
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -89,7 +89,7 @@ public class MemoryRealm  extends RealmBase {
     /**
      * The string manager for this package.
      */
-    private static StringManager sm =
+    private static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/realm/RealmBase.java b/java/org/apache/catalina/realm/RealmBase.java
index 19c61c589..6efa922db 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -137,7 +137,7 @@ public abstract class RealmBase
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index 1e050a19b..e271eeef3 100644
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -84,7 +84,7 @@ public class UserDatabaseRealm
     /**
      * The string manager for this package.
      */
-    private static StringManager sm =
+    private static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index eeaf9279a..f75530ffe 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -197,7 +197,7 @@ public class DefaultServlet
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java
index 11c252d89..58bcb6c87 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -209,7 +209,7 @@ public abstract class ManagerBase implements Manager, MBeanRegistration {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     /**
diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 9a8196b73..e69ce68db 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -242,7 +242,7 @@ public class StandardSession
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/startup/Embedded.java b/java/org/apache/catalina/startup/Embedded.java
index 1e4f9b288..8274a9a12 100644
--- a/java/org/apache/catalina/startup/Embedded.java
+++ b/java/org/apache/catalina/startup/Embedded.java
@@ -183,7 +183,7 @@ public class Embedded  extends StandardService {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
index 5f6994597..f4b897fc8 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
@@ -48,7 +48,7 @@ public class BioSender extends AbstractSender implements DataSender {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(Constants.Package);
 
     // ----------------------------------------------------- Instance Variables
 
diff --git a/java/org/apache/catalina/tribes/util/StringManager.java b/java/org/apache/catalina/tribes/util/StringManager.java
index 90a7b0954..bac15e289 100644
--- a/java/org/apache/catalina/tribes/util/StringManager.java
+++ b/java/org/apache/catalina/tribes/util/StringManager.java
@@ -242,7 +242,7 @@ public class StringManager {
      * @param packageName The package name
      */
 
-    public synchronized static StringManager getManager(String packageName) {
+    public synchronized static final StringManager getManager(String packageName) {
         StringManager mgr = managers.get(packageName);
 
         if (mgr == null) {
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 5f126d3f6..1b3e2840f 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -132,7 +132,7 @@ public class MemoryUserDatabase implements UserDatabase {
     /**
      * The string manager for this package.
      */
-    private static StringManager sm =
+    private static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/util/ExtensionValidator.java b/java/org/apache/catalina/util/ExtensionValidator.java
index 9510672e4..0368fba39 100644
--- a/java/org/apache/catalina/util/ExtensionValidator.java
+++ b/java/org/apache/catalina/util/ExtensionValidator.java
@@ -59,7 +59,7 @@ public final class ExtensionValidator {
     /**
      * The string resources for this package.
      */
-    private static StringManager sm =
+    private static final StringManager sm =
         StringManager.getManager("org.apache.catalina.util");
     
     private static ArrayList<Extension> containerAvailableExtensions = null;
diff --git a/java/org/apache/catalina/util/HexUtils.java b/java/org/apache/catalina/util/HexUtils.java
index 10084a196..8d119a167 100644
--- a/java/org/apache/catalina/util/HexUtils.java
+++ b/java/org/apache/catalina/util/HexUtils.java
@@ -57,7 +57,7 @@ public final class HexUtils {
     /**
      * The string manager for this package.
      */
-    private static StringManager sm =
+    private static final StringManager sm =
         StringManager.getManager("org.apache.catalina.util");
 
 
diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java b/java/org/apache/catalina/valves/ErrorReportValve.java
index 112bd7d50..bc663a283 100644
--- a/java/org/apache/catalina/valves/ErrorReportValve.java
+++ b/java/org/apache/catalina/valves/ErrorReportValve.java
@@ -69,7 +69,7 @@ public class ErrorReportValve
     /**
      * The StringManager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java
index 6d2a31f58..af462c8d4 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -352,7 +352,7 @@ public class RemoteIpValve extends ValveBase {
     /**
      * The StringManager for this package.
      */
-    protected static StringManager sm = StringManager.getManager(Constants.Package);
+    protected static final StringManager sm = StringManager.getManager(Constants.Package);
     
     /**
      * Convert a given comma delimited list of regular expressions into an array of compiled {@link Pattern}
diff --git a/java/org/apache/catalina/valves/RequestFilterValve.java b/java/org/apache/catalina/valves/RequestFilterValve.java
index e774e491d..72e964423 100644
--- a/java/org/apache/catalina/valves/RequestFilterValve.java
+++ b/java/org/apache/catalina/valves/RequestFilterValve.java
@@ -86,7 +86,7 @@ public abstract class RequestFilterValve
     /**
      * The StringManager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/catalina/valves/ValveBase.java b/java/org/apache/catalina/valves/ValveBase.java
index 50ac2cd7a..9ad0e1929 100644
--- a/java/org/apache/catalina/valves/ValveBase.java
+++ b/java/org/apache/catalina/valves/ValveBase.java
@@ -104,7 +104,7 @@ public abstract class ValveBase
     /**
      * The string manager for this package.
      */
-    protected final static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java
index 6ec6ca004..d8319bb07 100644
--- a/java/org/apache/coyote/ajp/AjpAprProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java
@@ -67,7 +67,7 @@ public class AjpAprProcessor implements ActionHook {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index 08fd4d5ce..f94119358 100644
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -60,7 +60,7 @@ public class AjpAprProtocol
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/ajp/AjpMessage.java b/java/org/apache/coyote/ajp/AjpMessage.java
index 4beba4a2b..86196bb7e 100644
--- a/java/org/apache/coyote/ajp/AjpMessage.java
+++ b/java/org/apache/coyote/ajp/AjpMessage.java
@@ -44,7 +44,7 @@ public class AjpMessage {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index 7b166f3f1..2bd9e8243 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -67,7 +67,7 @@ public class AjpProcessor implements ActionHook {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java
index 4f5ccc159..5489680bf 100644
--- a/java/org/apache/coyote/ajp/AjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpProtocol.java
@@ -61,7 +61,7 @@ public class AjpProtocol
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
index 6e7164e73..e1907ceba 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java
@@ -39,7 +39,7 @@ public class AbstractHttp11Processor {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     protected static boolean isSecurityEnabled = 
diff --git a/java/org/apache/coyote/http11/AbstractInputBuffer.java b/java/org/apache/coyote/http11/AbstractInputBuffer.java
index 791665be7..fa947f39e 100644
--- a/java/org/apache/coyote/http11/AbstractInputBuffer.java
+++ b/java/org/apache/coyote/http11/AbstractInputBuffer.java
@@ -47,7 +47,7 @@ public abstract class AbstractInputBuffer implements InputBuffer{
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/http11/AbstractOutputBuffer.java b/java/org/apache/coyote/http11/AbstractOutputBuffer.java
index 73ad1f203..a76a9f056 100644
--- a/java/org/apache/coyote/http11/AbstractOutputBuffer.java
+++ b/java/org/apache/coyote/http11/AbstractOutputBuffer.java
@@ -101,7 +101,7 @@ public abstract class AbstractOutputBuffer implements OutputBuffer{
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     // ------------------------------------------------------------- Properties
diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java
index 30a24be1b..634ab3390 100644
--- a/java/org/apache/coyote/http11/Http11AprProcessor.java
+++ b/java/org/apache/coyote/http11/Http11AprProcessor.java
@@ -75,7 +75,7 @@ public class Http11AprProcessor implements ActionHook {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java
index eb44dd50f..86b73fc32 100644
--- a/java/org/apache/coyote/http11/Http11AprProtocol.java
+++ b/java/org/apache/coyote/http11/Http11AprProtocol.java
@@ -59,7 +59,7 @@ public class Http11AprProtocol implements ProtocolHandler, MBeanRegistration {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     public Http11AprProtocol() {
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 5ccf6b1bb..4cf736d7f 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -69,7 +69,7 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
     /** Pass config info
diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java
index b4df3d682..2813a61f7 100644
--- a/java/org/apache/coyote/http11/Http11Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Protocol.java
@@ -63,7 +63,7 @@ public class Http11Protocol
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/http11/InternalAprInputBuffer.java b/java/org/apache/coyote/http11/InternalAprInputBuffer.java
index 0b1e231ae..f586f2d92 100644
--- a/java/org/apache/coyote/http11/InternalAprInputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalAprInputBuffer.java
@@ -81,7 +81,7 @@ public class InternalAprInputBuffer implements InputBuffer {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/coyote/http11/InternalAprOutputBuffer.java b/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
index c47b3850f..c1269e059 100644
--- a/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
@@ -91,7 +91,7 @@ public class InternalAprOutputBuffer
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/naming/ContextBindings.java b/java/org/apache/naming/ContextBindings.java
index 3b5080f9a..c8ac3df23 100644
--- a/java/org/apache/naming/ContextBindings.java
+++ b/java/org/apache/naming/ContextBindings.java
@@ -77,7 +77,7 @@ public class ContextBindings {
     /**
      * The string manager for this package.
      */
-    protected static StringManager sm = 
+    protected static final StringManager sm = 
         StringManager.getManager(Constants.Package);
 
 
diff --git a/java/org/apache/naming/StringManager.java b/java/org/apache/naming/StringManager.java
index 5aceb7f58..f5632a422 100644
--- a/java/org/apache/naming/StringManager.java
+++ b/java/org/apache/naming/StringManager.java
@@ -208,7 +208,7 @@ public class StringManager {
      * @param packageName
      */
 
-    public synchronized static StringManager getManager(String packageName) {
+    public synchronized static final StringManager getManager(String packageName) {
 	StringManager mgr = managers.get(packageName);
 	if (mgr == null) {
 	    mgr = new StringManager(packageName);
diff --git a/java/org/apache/tomcat/util/http/HttpMessages.java b/java/org/apache/tomcat/util/http/HttpMessages.java
index 195d30f3a..9f1d05829 100644
--- a/java/org/apache/tomcat/util/http/HttpMessages.java
+++ b/java/org/apache/tomcat/util/http/HttpMessages.java
@@ -30,7 +30,7 @@ import org.apache.tomcat.util.res.StringManager;
  */
 public class HttpMessages {
     // XXX move message resources in this package
-    protected static StringManager sm =
+    protected static final StringManager sm =
         StringManager.getManager("org.apache.tomcat.util.http.res");
 	
     static String st_200=null;
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index adb8286f9..98e60cf5d 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -80,7 +80,7 @@ import org.apache.tomcat.util.res.StringManager;
 public class JSSESocketFactory
     extends org.apache.tomcat.util.net.ServerSocketFactory {
 
-    private static StringManager sm =
+    private static final StringManager sm =
         StringManager.getManager("org.apache.tomcat.util.net.jsse.res");
 
     // defaults
diff --git a/java/org/apache/tomcat/util/res/StringManager.java b/java/org/apache/tomcat/util/res/StringManager.java
index a7b8765fb..5edec7cf6 100644
--- a/java/org/apache/tomcat/util/res/StringManager.java
+++ b/java/org/apache/tomcat/util/res/StringManager.java
@@ -158,7 +158,7 @@ public class StringManager {
      *
      * @param packageName The package name
      */
-    public synchronized static StringManager getManager(String packageName) {
+    public synchronized static final StringManager getManager(String packageName) {
         StringManager mgr = managers.get(packageName);
         if (mgr == null) {
             mgr = new StringManager(packageName);
diff --git a/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java b/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java
index efef535ee..9ded5d93d 100644
--- a/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java
+++ b/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java
@@ -33,7 +33,7 @@ public final class HexDump {
 
 
     // -------------------------------------------------------------- Constants
-    static StringManager sm;
+    static final StringManager sm;
 
     /**
      *  Table for HEX to DEC byte translation.
-- 
2.11.0