Author: markt Date: Fri Jun 1 16:11:10 2018 New Revision: 1832698 URL: http://svn.apache.org/viewvc?rev=1832698&view=rev Log: Add comment to non-static loggers
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Modified: tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java Fri Jun 1 16:11:10 2018 @@ -90,7 +90,7 @@ import org.apache.tomcat.util.res.String public abstract class AuthenticatorBase extends ValveBase implements Authenticator, RegistrationListener { - private final Log log = LogFactory.getLog(AuthenticatorBase.class); + private final Log log = LogFactory.getLog(AuthenticatorBase.class); // must not be static /** * "Expires" header always set to Date(1), so generate once only Modified: tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java Fri Jun 1 16:11:10 2018 @@ -45,7 +45,7 @@ import org.apache.tomcat.util.codec.bina */ public class BasicAuthenticator extends AuthenticatorBase { - private final Log log = LogFactory.getLog(BasicAuthenticator.class); + private final Log log = LogFactory.getLog(BasicAuthenticator.class); // must not be static private Charset charset = StandardCharsets.ISO_8859_1; private String charsetString = null; Modified: tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java Fri Jun 1 16:11:10 2018 @@ -45,7 +45,7 @@ import org.apache.tomcat.util.security.M */ public class DigestAuthenticator extends AuthenticatorBase { - private final Log log = LogFactory.getLog(DigestAuthenticator.class); + private final Log log = LogFactory.getLog(DigestAuthenticator.class); // must not be static // -------------------------------------------------------------- Constants Modified: tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Fri Jun 1 16:11:10 2018 @@ -52,7 +52,7 @@ import org.apache.tomcat.util.http.MimeH public class FormAuthenticator extends AuthenticatorBase { - private final Log log = LogFactory.getLog(FormAuthenticator.class); + private final Log log = LogFactory.getLog(FormAuthenticator.class); // must not be static // ----------------------------------------------------- Instance Variables Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java Fri Jun 1 16:11:10 2018 @@ -54,7 +54,7 @@ import org.ietf.jgss.Oid; */ public class SpnegoAuthenticator extends AuthenticatorBase { - private final Log log = LogFactory.getLog(SpnegoAuthenticator.class); + private final Log log = LogFactory.getLog(SpnegoAuthenticator.class); // must not be static private static final String AUTH_HEADER_VALUE_NEGOTIATE = "Negotiate"; private String loginConfigName = Constants.DEFAULT_LOGIN_MODULE_NAME; Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java Fri Jun 1 16:11:10 2018 @@ -40,7 +40,7 @@ import org.apache.tomcat.util.res.String public class AuthConfigFactoryImpl extends AuthConfigFactory { - private final Log log = LogFactory.getLog(AuthConfigFactoryImpl.class); + private final Log log = LogFactory.getLog(AuthConfigFactoryImpl.class); // must not be static private static final StringManager sm = StringManager.getManager(AuthConfigFactoryImpl.class); private static final String CONFIG_PATH = "conf/jaspic-providers.xml"; Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java Fri Jun 1 16:11:10 2018 @@ -39,7 +39,7 @@ import org.apache.tomcat.util.res.String */ public class CallbackHandlerImpl implements CallbackHandler { - private final Log log = LogFactory.getLog(CallbackHandlerImpl.class); + private final Log log = LogFactory.getLog(CallbackHandlerImpl.class); // must not be static private static final StringManager sm = StringManager.getManager(CallbackHandlerImpl.class); private static CallbackHandler instance; Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Fri Jun 1 16:11:10 2018 @@ -61,7 +61,7 @@ public final class ApplicationFilterConf static final StringManager sm = StringManager.getManager(Constants.Package); - private final Log log = LogFactory.getLog(ApplicationFilterConfig.class); + private final Log log = LogFactory.getLog(ApplicationFilterConfig.class); // must not be static /** * Empty String collection to serve as the basis for empty enumerations. Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri Jun 1 16:11:10 2018 @@ -74,7 +74,7 @@ import org.apache.tomcat.util.modeler.Ut public class StandardWrapper extends ContainerBase implements ServletConfig, Wrapper, NotificationEmitter { - private final Log log = LogFactory.getLog(StandardWrapper.class); + private final Log log = LogFactory.getLog(StandardWrapper.class); // must not be static protected static final String[] DEFAULT_SERVLET_METHODS = new String[] { "GET", "HEAD", "POST" }; Modified: tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java Fri Jun 1 16:11:10 2018 @@ -49,7 +49,7 @@ public class AddDefaultCharsetFilter ext // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(AddDefaultCharsetFilter.class); + private final Log log = LogFactory.getLog(AddDefaultCharsetFilter.class); // must not be static private static final String DEFAULT_ENCODING = "ISO-8859-1"; Modified: tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/CorsFilter.java Fri Jun 1 16:11:10 2018 @@ -79,7 +79,7 @@ import org.apache.tomcat.util.res.String public class CorsFilter extends GenericFilter { private static final long serialVersionUID = 1L; - private final Log log = LogFactory.getLog(CorsFilter.class); + private final Log log = LogFactory.getLog(CorsFilter.class); // must not be static private static final StringManager sm = StringManager.getManager(CorsFilter.class); Modified: tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java Fri Jun 1 16:11:10 2018 @@ -31,7 +31,7 @@ public abstract class CsrfPreventionFilt // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(CsrfPreventionFilterBase.class); + private final Log log = LogFactory.getLog(CsrfPreventionFilterBase.class); // must not be static private String randomClass = SecureRandom.class.getName(); Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Fri Jun 1 16:11:10 2018 @@ -1052,7 +1052,7 @@ public class ExpiresFilter extends Filte // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(ExpiresFilter.class); + private final Log log = LogFactory.getLog(ExpiresFilter.class); // must not be static private static final String PARAMETER_EXPIRES_BY_TYPE = "ExpiresByType"; Modified: tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java Fri Jun 1 16:11:10 2018 @@ -45,7 +45,7 @@ public class FailedRequestFilter extends // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(FailedRequestFilter.class); + private final Log log = LogFactory.getLog(FailedRequestFilter.class); // must not be static @Override protected Log getLogger() { Modified: tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java Fri Jun 1 16:11:10 2018 @@ -38,7 +38,7 @@ public class HttpHeaderSecurityFilter ex // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(HttpHeaderSecurityFilter.class); + private final Log log = LogFactory.getLog(HttpHeaderSecurityFilter.class); // must not be static // HSTS private static final String HSTS_HEADER_NAME = "Strict-Transport-Security"; Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java Fri Jun 1 16:11:10 2018 @@ -37,7 +37,7 @@ public final class RemoteAddrFilter exte // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(RemoteAddrFilter.class); + private final Log log = LogFactory.getLog(RemoteAddrFilter.class); // must not be static /** Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java Fri Jun 1 16:11:10 2018 @@ -46,7 +46,7 @@ public final class RemoteCIDRFilter exte /** * Our logger */ - private final Log log = LogFactory.getLog(RemoteCIDRFilter.class); + private final Log log = LogFactory.getLog(RemoteCIDRFilter.class); // must not be static /** * The list of allowed {@link NetMask}s Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java Fri Jun 1 16:11:10 2018 @@ -37,7 +37,7 @@ public final class RemoteHostFilter exte // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(RemoteHostFilter.class); + private final Log log = LogFactory.getLog(RemoteHostFilter.class); // must not be static /** Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Fri Jun 1 16:11:10 2018 @@ -654,7 +654,7 @@ public class RemoteIpFilter extends Gene // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(RemoteIpFilter.class); + private final Log log = LogFactory.getLog(RemoteIpFilter.class); // must not be static protected static final String PROTOCOL_HEADER_PARAMETER = "protocolHeader"; Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Fri Jun 1 16:11:10 2018 @@ -66,7 +66,7 @@ public class RequestDumperFilter extends // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(RequestDumperFilter.class); + private final Log log = LogFactory.getLog(RequestDumperFilter.class); // must not be static /** Modified: tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java Fri Jun 1 16:11:10 2018 @@ -56,7 +56,7 @@ public class SetCharacterEncodingFilter // Log must be non-static as loggers are created per class-loader and this // Filter may be used in multiple class loaders - private final Log log = LogFactory.getLog(SetCharacterEncodingFilter.class); + private final Log log = LogFactory.getLog(SetCharacterEncodingFilter.class); // must not be static // ----------------------------------------------------- Instance Variables Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Fri Jun 1 16:11:10 2018 @@ -38,7 +38,7 @@ import org.apache.tomcat.util.res.String public class BackupManager extends ClusterManagerBase implements MapOwner, DistributedManager { - private final Log log = LogFactory.getLog(BackupManager.class); + private final Log log = LogFactory.getLog(BackupManager.class); // must not be static /** * The string manager for this package. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java Fri Jun 1 16:11:10 2018 @@ -35,7 +35,7 @@ import org.apache.juli.logging.LogFactor public abstract class ClusterManagerBase extends ManagerBase implements ClusterManager { - private final Log log = LogFactory.getLog(ClusterManagerBase.class); + private final Log log = LogFactory.getLog(ClusterManagerBase.class); // must not be static /** * A reference to the cluster Modified: tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java Fri Jun 1 16:11:10 2018 @@ -49,7 +49,7 @@ import org.apache.juli.logging.LogFactor public abstract class PersistentManagerBase extends ManagerBase implements StoreManager { - private final Log log = LogFactory.getLog(PersistentManagerBase.class); + private final Log log = LogFactory.getLog(PersistentManagerBase.class); // must not be static // ---------------------------------------------------- Security Classes Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Fri Jun 1 16:11:10 2018 @@ -61,7 +61,7 @@ public abstract class AbstractReplicated protected static final StringManager sm = StringManager.getManager(AbstractReplicatedMap.class); - private final Log log = LogFactory.getLog(AbstractReplicatedMap.class); + private final Log log = LogFactory.getLog(AbstractReplicatedMap.class); // must not be static /** * The default initial capacity - MUST be a power of two. Modified: tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java Fri Jun 1 16:11:10 2018 @@ -32,7 +32,7 @@ import org.apache.tomcat.util.res.String public abstract class SessionIdGeneratorBase extends LifecycleBase implements SessionIdGenerator { - private final Log log = LogFactory.getLog(SessionIdGeneratorBase.class); + private final Log log = LogFactory.getLog(SessionIdGeneratorBase.class); // must not be static private static final StringManager sm = Modified: tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java (original) +++ tomcat/trunk/java/org/apache/coyote/http2/ConnectionSettingsBase.java Fri Jun 1 16:11:10 2018 @@ -25,7 +25,7 @@ import org.apache.tomcat.util.res.String abstract class ConnectionSettingsBase<T extends Throwable> { - private final Log log = LogFactory.getLog(ConnectionSettingsBase.class); + private final Log log = LogFactory.getLog(ConnectionSettingsBase.class); // must not be static private final StringManager sm = StringManager.getManager(ConnectionSettingsBase.class); private final String connectionId; Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original) +++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Fri Jun 1 16:11:10 2018 @@ -43,7 +43,7 @@ import org.apache.juli.logging.LogFactor public final class EmbeddedServletOptions implements Options { // Logger - private final Log log = LogFactory.getLog(EmbeddedServletOptions.class); + private final Log log = LogFactory.getLog(EmbeddedServletOptions.class); // must not be static private Properties settings = new Properties(); Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Fri Jun 1 16:11:10 2018 @@ -39,7 +39,7 @@ import org.apache.juli.logging.LogFactor public class JspConfig { // Logger - private final Log log = LogFactory.getLog(JspConfig.class); + private final Log log = LogFactory.getLog(JspConfig.class); // must not be static private Vector<JspPropertyGroup> jspProperties = null; private final ServletContext ctxt; Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Fri Jun 1 16:11:10 2018 @@ -49,7 +49,7 @@ class JspReader { /** * Logger. */ - private final Log log = LogFactory.getLog(JspReader.class); + private final Log log = LogFactory.getLog(JspReader.class); // must not be static /** * The current spot in the file. Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Fri Jun 1 16:11:10 2018 @@ -62,7 +62,7 @@ public final class JspRuntimeContext { /** * Logger */ - private final Log log = LogFactory.getLog(JspRuntimeContext.class); + private final Log log = LogFactory.getLog(JspRuntimeContext.class); // must not be static /** * Counts how many times the webapp's JSPs have been reloaded. Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original) +++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Fri Jun 1 16:11:10 2018 @@ -159,7 +159,7 @@ public class SmapUtil { // Installation logic (from Robert Field, JSR-045 spec lead) private static class SDEInstaller { - private final Log log = LogFactory.getLog(SDEInstaller.class); + private final Log log = LogFactory.getLog(SDEInstaller.class); // must not be static static final String nameSDE = "SourceDebugExtension"; Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Fri Jun 1 16:11:10 2018 @@ -41,7 +41,7 @@ import org.xml.sax.SAXException; public class JasperInitializer implements ServletContainerInitializer { private static final String MSG = "org.apache.jasper.servlet.JasperInitializer"; - private final Log log = LogFactory.getLog(JasperInitializer.class); + private final Log log = LogFactory.getLog(JasperInitializer.class); // must not be static /** * Preload classes required at runtime by a JSP servlet so that Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Fri Jun 1 16:11:10 2018 @@ -80,7 +80,7 @@ public class JspServletWrapper { } // Logger - private final Log log = LogFactory.getLog(JspServletWrapper.class); + private final Log log = LogFactory.getLog(JspServletWrapper.class); // must not be static private Servlet theServlet; private final String jspUri; Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Fri Jun 1 16:11:10 2018 @@ -53,7 +53,7 @@ import org.xml.sax.SAXException; * Scans for and loads Tag Library Descriptors contained in a web application. */ public class TldScanner { - private final Log log = LogFactory.getLog(TldScanner.class); + private final Log log = LogFactory.getLog(TldScanner.class); // must not be static private static final String MSG = "org.apache.jasper.servlet.TldScanner"; private static final String TLD_EXT = ".tld"; private static final String WEB_INF = "/WEB-INF/"; Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java Fri Jun 1 16:11:10 2018 @@ -37,7 +37,7 @@ import org.xml.sax.SAXException; * Parser for Tag Plugin descriptors. */ public class TagPluginParser { - private final Log log = LogFactory.getLog(TagPluginParser.class); + private final Log log = LogFactory.getLog(TagPluginParser.class); // must not be static private static final String PREFIX = "tag-plugins/tag-plugin"; private final Digester digester; private final Map<String, String> plugins = new HashMap<>(); Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java Fri Jun 1 16:11:10 2018 @@ -36,7 +36,7 @@ import org.xml.sax.SAXException; * Parses a Tag Library Descriptor. */ public class TldParser { - private final Log log = LogFactory.getLog(TldParser.class); + private final Log log = LogFactory.getLog(TldParser.class); // must not be static private final Digester digester; public TldParser(boolean namespaceAware, boolean validation, Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Fri Jun 1 16:11:10 2018 @@ -64,7 +64,7 @@ public class WebXml extends XmlEncodingB private static final StringManager sm = StringManager.getManager(Constants.PACKAGE_NAME); - private final Log log = LogFactory.getLog(WebXml.class); + private final Log log = LogFactory.getLog(WebXml.class); // must not be static /** * Global defaults are overridable but Servlets and Servlet mappings need to Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java Fri Jun 1 16:11:10 2018 @@ -31,7 +31,7 @@ import org.xml.sax.SAXParseException; public class WebXmlParser { - private final Log log = LogFactory.getLog(WebXmlParser.class); + private final Log log = LogFactory.getLog(WebXmlParser.class); // must not be static /** * The string resources for this package. Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Fri Jun 1 16:11:10 2018 @@ -61,7 +61,7 @@ import org.apache.tomcat.util.res.String */ public class StandardJarScanner implements JarScanner { - private final Log log = LogFactory.getLog(StandardJarScanner.class); + private final Log log = LogFactory.getLog(StandardJarScanner.class); // must not be static /** * The string resources for this package. Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java Fri Jun 1 16:11:10 2018 @@ -30,7 +30,7 @@ import org.apache.tomcat.util.res.String public class WsFrameClient extends WsFrameBase { - private final Log log = LogFactory.getLog(WsFrameClient.class); + private final Log log = LogFactory.getLog(WsFrameClient.class); // must not be static private static final StringManager sm = StringManager.getManager(WsFrameClient.class); private final AsyncChannelWrapper channel; Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java Fri Jun 1 16:11:10 2018 @@ -55,7 +55,7 @@ public abstract class WsRemoteEndpointIm protected static final SendResult SENDRESULT_OK = new SendResult(); - private final Log log = LogFactory.getLog(WsRemoteEndpointImplBase.class); + private final Log log = LogFactory.getLog(WsRemoteEndpointImplBase.class); // must not be static private final StateMachine stateMachine = new StateMachine(); Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri Jun 1 16:11:10 2018 @@ -64,7 +64,7 @@ public class WsSession implements Sessio private static final StringManager sm = StringManager.getManager(WsSession.class); private static AtomicLong ids = new AtomicLong(0); - private final Log log = LogFactory.getLog(WsSession.class); + private final Log log = LogFactory.getLog(WsSession.class); // must not be static private final Endpoint localEndpoint; private final WsRemoteEndpointImplBase wsRemoteEndpoint; Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Fri Jun 1 16:11:10 2018 @@ -87,7 +87,7 @@ public class WsWebSocketContainer implem private volatile AsynchronousChannelGroup asynchronousChannelGroup = null; private final Object asynchronousChannelGroupLock = new Object(); - private final Log log = LogFactory.getLog(WsWebSocketContainer.class); + private final Log log = LogFactory.getLog(WsWebSocketContainer.class); // must not be static private final Map<Endpoint, Set<WsSession>> endpointSessionMap = new HashMap<>(); private final Map<WsSession,WsSession> sessions = new ConcurrentHashMap<>(); Modified: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java Fri Jun 1 16:11:10 2018 @@ -39,7 +39,7 @@ import org.apache.tomcat.util.res.String */ public abstract class PojoEndpointBase extends Endpoint { - private final Log log = LogFactory.getLog(PojoEndpointBase.class); + private final Log log = LogFactory.getLog(PojoEndpointBase.class); // must not be static private static final StringManager sm = StringManager.getManager(PojoEndpointBase.class); private Object pojo; Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java Fri Jun 1 16:11:10 2018 @@ -33,7 +33,7 @@ import org.apache.tomcat.websocket.WsSes public class WsFrameServer extends WsFrameBase { - private final Log log = LogFactory.getLog(WsFrameServer.class); + private final Log log = LogFactory.getLog(WsFrameServer.class); // must not be static private static final StringManager sm = StringManager.getManager(WsFrameServer.class); private final SocketWrapperBase<?> socketWrapper; Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java Fri Jun 1 16:11:10 2018 @@ -46,7 +46,7 @@ import org.apache.tomcat.websocket.WsSes */ public class WsHttpUpgradeHandler implements InternalHttpUpgradeHandler { - private final Log log = LogFactory.getLog(WsHttpUpgradeHandler.class); + private final Log log = LogFactory.getLog(WsHttpUpgradeHandler.class); // must not be static private static final StringManager sm = StringManager.getManager(WsHttpUpgradeHandler.class); private final ClassLoader applicationClassLoader; Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1832698&r1=1832697&r2=1832698&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java Fri Jun 1 16:11:10 2018 @@ -44,7 +44,7 @@ public class WsRemoteEndpointImplServer private static final StringManager sm = StringManager.getManager(WsRemoteEndpointImplServer.class); - private final Log log = LogFactory.getLog(WsRemoteEndpointImplServer.class); + private final Log log = LogFactory.getLog(WsRemoteEndpointImplServer.class); // must not be static private final SocketWrapperBase<?> socketWrapper; private final WsWriteTimeout wsWriteTimeout; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org