Add comment to non-static loggers
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1832701 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 1647981..32b4edb 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -75,7 +75,7 @@
public abstract class AuthenticatorBase extends ValveBase
implements Authenticator {
- private final Log log = LogFactory.getLog(AuthenticatorBase.class);
+ private final Log log = LogFactory.getLog(AuthenticatorBase.class); // must not be static
//------------------------------------------------------ Constructor
diff --git a/java/org/apache/catalina/authenticator/BasicAuthenticator.java b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
index 2150cf5..f016f4e 100644
--- a/java/org/apache/catalina/authenticator/BasicAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/BasicAuthenticator.java
@@ -45,7 +45,7 @@
*/
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;
diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
index 67cbfda..475e791 100644
--- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
@@ -45,7 +45,7 @@
*/
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
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 81fb4dd..ab3582a 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -53,7 +53,7 @@
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
diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
index af23593..3fb8c3c 100644
--- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
@@ -55,7 +55,7 @@
*/
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 String loginConfigName = Constants.DEFAULT_LOGIN_MODULE_NAME;
public String getLoginConfigName() {
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index 5b1ca02..513a233 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -62,7 +62,7 @@
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.
diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index 90b5b45..71bfa28 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -76,7 +76,7 @@
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" };
diff --git a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
index 1b1e019..29bcb68 100644
--- a/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
+++ b/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
@@ -49,7 +49,7 @@
// 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";
diff --git a/java/org/apache/catalina/filters/CorsFilter.java b/java/org/apache/catalina/filters/CorsFilter.java
index c1a911c..71acdb6 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -78,7 +78,7 @@
*/
public class CorsFilter implements Filter {
- 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(Constants.Package);
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java b/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
index 4396fc0..2219e32 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
@@ -31,7 +31,7 @@
// 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();
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java b/java/org/apache/catalina/filters/ExpiresFilter.java
index 8dcfcc9..309db36 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -1052,7 +1052,7 @@
// 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";
diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java b/java/org/apache/catalina/filters/FailedRequestFilter.java
index 100b0ed..c2ad5b4 100644
--- a/java/org/apache/catalina/filters/FailedRequestFilter.java
+++ b/java/org/apache/catalina/filters/FailedRequestFilter.java
@@ -48,7 +48,7 @@
// 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() {
diff --git a/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java b/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
index 4a2e1bc..a41aca5 100644
--- a/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
+++ b/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
@@ -38,7 +38,7 @@
// 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";
diff --git a/java/org/apache/catalina/filters/RemoteAddrFilter.java b/java/org/apache/catalina/filters/RemoteAddrFilter.java
index e8dd541..a753aef 100644
--- a/java/org/apache/catalina/filters/RemoteAddrFilter.java
+++ b/java/org/apache/catalina/filters/RemoteAddrFilter.java
@@ -41,7 +41,7 @@
// 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
/**
diff --git a/java/org/apache/catalina/filters/RemoteHostFilter.java b/java/org/apache/catalina/filters/RemoteHostFilter.java
index c79308c..a44f6b8 100644
--- a/java/org/apache/catalina/filters/RemoteHostFilter.java
+++ b/java/org/apache/catalina/filters/RemoteHostFilter.java
@@ -41,7 +41,7 @@
// 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
/**
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 2906dcc..5638946 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -653,7 +653,7 @@
// 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";
diff --git a/java/org/apache/catalina/filters/RequestDumperFilter.java b/java/org/apache/catalina/filters/RequestDumperFilter.java
index b923fa6..e92d97d 100644
--- a/java/org/apache/catalina/filters/RequestDumperFilter.java
+++ b/java/org/apache/catalina/filters/RequestDumperFilter.java
@@ -65,7 +65,7 @@
// 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
/**
diff --git a/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java b/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
index d3c3ba0..2b1dda9 100644
--- a/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
+++ b/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
@@ -56,7 +56,7 @@
// 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
diff --git a/java/org/apache/catalina/ha/session/BackupManager.java b/java/org/apache/catalina/ha/session/BackupManager.java
index 4f4380b..5e0d15b 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -39,7 +39,7 @@
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.
diff --git a/java/org/apache/catalina/ha/session/ClusterManagerBase.java b/java/org/apache/catalina/ha/session/ClusterManagerBase.java
index 2b58416..86e9e33 100644
--- a/java/org/apache/catalina/ha/session/ClusterManagerBase.java
+++ b/java/org/apache/catalina/ha/session/ClusterManagerBase.java
@@ -35,7 +35,7 @@
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
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java
index b4d88c7..83adf82 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -51,7 +51,7 @@
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
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 2e609e0..8782948 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -60,7 +60,7 @@
protected static final StringManager sm =
StringManager.getManager(AbstractReplicatedMap.class.getPackage().getName());
- 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.
diff --git a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
index d807722..0d6a64f 100644
--- a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
@@ -64,7 +64,7 @@
*/
public class LazyReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
private static final long serialVersionUID = 1L;
- private final Log log = LogFactory.getLog(LazyReplicatedMap.class);
+ private final Log log = LogFactory.getLog(LazyReplicatedMap.class); // must not be static
//------------------------------------------------------------------------------
diff --git a/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
index f29fb9f..43af1ff 100644
--- a/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
@@ -57,7 +57,7 @@
private static final long serialVersionUID = 1L;
- private final Log log = LogFactory.getLog(ReplicatedMap.class);
+ private final Log log = LogFactory.getLog(ReplicatedMap.class); // must not be static
//--------------------------------------------------------------------------
// CONSTRUCTORS / DESTRUCTORS
diff --git a/java/org/apache/catalina/util/SessionIdGeneratorBase.java b/java/org/apache/catalina/util/SessionIdGeneratorBase.java
index 6fd7c9d..a59e0fe 100644
--- a/java/org/apache/catalina/util/SessionIdGeneratorBase.java
+++ b/java/org/apache/catalina/util/SessionIdGeneratorBase.java
@@ -32,7 +32,7 @@
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 =
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java
index c325726..3726420 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -43,7 +43,7 @@
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();
diff --git a/java/org/apache/jasper/compiler/JspConfig.java b/java/org/apache/jasper/compiler/JspConfig.java
index 165f213..e4e6e98 100644
--- a/java/org/apache/jasper/compiler/JspConfig.java
+++ b/java/org/apache/jasper/compiler/JspConfig.java
@@ -40,7 +40,7 @@
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;
diff --git a/java/org/apache/jasper/compiler/JspReader.java b/java/org/apache/jasper/compiler/JspReader.java
index 7086235..17f1b9e 100644
--- a/java/org/apache/jasper/compiler/JspReader.java
+++ b/java/org/apache/jasper/compiler/JspReader.java
@@ -49,7 +49,7 @@
/**
* 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.
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index ea6b96b..dec7c34 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -60,7 +60,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.
diff --git a/java/org/apache/jasper/servlet/JasperInitializer.java b/java/org/apache/jasper/servlet/JasperInitializer.java
index 4196044..c322ed9 100644
--- a/java/org/apache/jasper/servlet/JasperInitializer.java
+++ b/java/org/apache/jasper/servlet/JasperInitializer.java
@@ -41,7 +41,7 @@
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
diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java
index b9f6e25..41f09e5 100644
--- a/java/org/apache/jasper/servlet/JspServletWrapper.java
+++ b/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -79,7 +79,7 @@
}
// 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;
diff --git a/java/org/apache/jasper/servlet/TldScanner.java b/java/org/apache/jasper/servlet/TldScanner.java
index c3fb142..f1aaaed 100644
--- a/java/org/apache/jasper/servlet/TldScanner.java
+++ b/java/org/apache/jasper/servlet/TldScanner.java
@@ -55,7 +55,7 @@
* 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/";
diff --git a/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java b/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
index 15bda4e..93d021d 100644
--- a/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
@@ -37,7 +37,7 @@
* 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<>();
diff --git a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
index edd117b..1c59516 100644
--- a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
@@ -36,7 +36,7 @@
* 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,
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 5753d2d..c8c6bc3 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -62,7 +62,7 @@
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
// be unique. Duplicates normally trigger an error. This flag indicates if
diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java b/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
index 312524f..e728c24 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
@@ -31,7 +31,7 @@
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.
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 703f3ef..ff6cea6 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1037,7 +1037,7 @@
*/
protected class Acceptor extends AbstractEndpoint.Acceptor {
- private final Log log = LogFactory.getLog(AprEndpoint.Acceptor.class);
+ private final Log log = LogFactory.getLog(AprEndpoint.Acceptor.class); // must not be static
@Override
public void run() {
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
index a1b89a1..9b12ce9 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -61,7 +61,7 @@
*/
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.
diff --git a/java/org/apache/tomcat/websocket/WsFrameClient.java b/java/org/apache/tomcat/websocket/WsFrameClient.java
index e408bd0..c660827 100644
--- a/java/org/apache/tomcat/websocket/WsFrameClient.java
+++ b/java/org/apache/tomcat/websocket/WsFrameClient.java
@@ -30,7 +30,7 @@
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(Constants.PACKAGE_NAME);
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index 4a6ffca..dc3fb42 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -59,7 +59,7 @@
public static final String BLOCKING_SEND_TIMEOUT_PROPERTY =
"org.apache.tomcat.websocket.BLOCKING_SEND_TIMEOUT";
- 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();
diff --git a/java/org/apache/tomcat/websocket/WsSession.java b/java/org/apache/tomcat/websocket/WsSession.java
index 19d3e2f..98ef313 100644
--- a/java/org/apache/tomcat/websocket/WsSession.java
+++ b/java/org/apache/tomcat/websocket/WsSession.java
@@ -64,7 +64,7 @@
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;
diff --git a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
index 913e721..734e747 100644
--- a/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
+++ b/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
@@ -118,7 +118,7 @@
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<>();
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
index feccca3..ce31174 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
@@ -39,7 +39,7 @@
*/
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(Constants.PACKAGE_NAME);
diff --git a/java/org/apache/tomcat/websocket/server/WsFrameServer.java b/java/org/apache/tomcat/websocket/server/WsFrameServer.java
index 247a370..06dd701 100644
--- a/java/org/apache/tomcat/websocket/server/WsFrameServer.java
+++ b/java/org/apache/tomcat/websocket/server/WsFrameServer.java
@@ -30,7 +30,7 @@
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(Constants.PACKAGE_NAME);
private final ServletInputStream sis;
diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index cdb7033..819b324 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -46,7 +46,7 @@
*/
public class WsHttpUpgradeHandler implements HttpUpgradeHandler {
- 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 Endpoint ep;
diff --git a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
index 61e57f2..06c1e34 100644
--- a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
+++ b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
@@ -43,7 +43,7 @@
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
- private final Log log = LogFactory.getLog(WsRemoteEndpointImplServer.class);
+ private final Log log = LogFactory.getLog(WsRemoteEndpointImplServer.class); // must not be static
private static final Queue<OnResultRunnable> onResultRunnables =
new ConcurrentLinkedQueue<>();
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index 18642ad..951a686 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -74,7 +74,7 @@
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
- private final Log log = LogFactory.getLog(WsServerContainer.class);
+ private final Log log = LogFactory.getLog(WsServerContainer.class); // must not be static
private static final CloseReason AUTHENTICATED_HTTP_SESSION_CLOSED =
new CloseReason(CloseCodes.VIOLATED_POLICY,
