Author: markt Date: Mon Nov 9 21:06:37 2009 New Revision: 834233 URL: http://svn.apache.org/viewvc?rev=834233&view=rev Log: StringManagers should be static final
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java tomcat/trunk/java/org/apache/catalina/core/JasperListener.java tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java tomcat/trunk/java/org/apache/catalina/session/StoreBase.java tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java tomcat/trunk/java/org/apache/naming/NamingContext.java tomcat/trunk/java/org/apache/naming/SelectorContext.java tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Nov 9 21:06:37 2009 @@ -187,7 +187,7 @@ /** * The string manager for this package. */ - protected StringManager sm = + protected static final StringManager sm = StringManager.getManager(Constants.Package); Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Nov 9 21:06:37 2009 @@ -106,7 +106,7 @@ /** * The string manager for this package. */ - protected StringManager sm = + protected static final StringManager sm = StringManager.getManager(Constants.Package); Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Mon Nov 9 21:06:37 2009 @@ -76,7 +76,7 @@ /** * The string manager for this package. */ - private StringManager sm = + private static final StringManager sm = StringManager.getManager(Constants.Package); // It should be null - and fail if not set Modified: tomcat/trunk/java/org/apache/catalina/core/JasperListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JasperListener.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/JasperListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/JasperListener.java Mon Nov 9 21:06:37 2009 @@ -43,7 +43,7 @@ /** * The string manager for this package. */ - protected StringManager sm = + protected static final StringManager sm = StringManager.getManager(Constants.Package); Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java Mon Nov 9 21:06:37 2009 @@ -45,7 +45,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); protected CatalinaCluster cluster = null; Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Mon Nov 9 21:06:37 2009 @@ -123,7 +123,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** * Has this component been started yet? Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Mon Nov 9 21:06:37 2009 @@ -119,7 +119,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** * The cluster name to join Modified: tomcat/trunk/java/org/apache/catalina/session/StoreBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StoreBase.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StoreBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StoreBase.java Mon Nov 9 21:06:37 2009 @@ -70,7 +70,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** * The Manager with which this JDBCStore is associated. Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java Mon Nov 9 21:06:37 2009 @@ -52,7 +52,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** * The descriptive information about this implementation. Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java Mon Nov 9 21:06:37 2009 @@ -42,7 +42,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Mon Nov 9 21:06:37 2009 @@ -51,7 +51,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** * The descriptive information about this implementation. Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Mon Nov 9 21:06:37 2009 @@ -199,7 +199,7 @@ /** * The string manager for this package. */ - protected StringManager sm = + protected static final StringManager sm = StringManager.getManager(Constants.Package); Modified: tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java Mon Nov 9 21:06:37 2009 @@ -77,7 +77,7 @@ /** * The string manager for this package. */ - protected StringManager sm = + protected static final StringManager sm = StringManager.getManager(Constants.Package); Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Mon Nov 9 21:06:37 2009 @@ -230,7 +230,7 @@ /** * The string manager for this package. */ - private StringManager sm = StringManager.getManager(Constants.Package); + private static final StringManager sm = StringManager.getManager(Constants.Package); /** Modified: tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java Mon Nov 9 21:06:37 2009 @@ -65,7 +65,7 @@ /** * The string manager for this package. */ - private StringManager sm = + private static final StringManager sm = StringManager.getManager(Constants.Package); Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/naming/NamingContext.java (original) +++ tomcat/trunk/java/org/apache/naming/NamingContext.java Mon Nov 9 21:06:37 2009 @@ -108,7 +108,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original) +++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Mon Nov 9 21:06:37 2009 @@ -95,7 +95,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original) +++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Mon Nov 9 21:06:37 2009 @@ -91,7 +91,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** Modified: tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java (original) +++ tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java Mon Nov 9 21:06:37 2009 @@ -134,7 +134,7 @@ /** * The string manager for this package. */ - protected StringManager sm = StringManager.getManager(Constants.Package); + protected static final StringManager sm = StringManager.getManager(Constants.Package); /** Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=834233&r1=834232&r2=834233&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Nov 9 21:06:37 2009 @@ -39,7 +39,7 @@ protected static final Log log = LogFactory.getLog(AbstractEndpoint.class); // -------------------------------------------------------------- Constants - protected StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res"); + protected static final StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res"); /** * The Request attribute key for the cipher suite. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org