Author: markt
Date: Fri Jun  1 16:13:57 2018
New Revision: 1832701

URL: http://svn.apache.org/viewvc?rev=1832701&view=rev
Log:
Add comment to non-static loggers

Modified:
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
    tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
    
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
    tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
    tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
    
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 Fri Jun  1 16:13:57 2018
@@ -75,7 +75,7 @@ import org.apache.tomcat.util.res.String
 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

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
 Fri Jun  1 16:13:57 2018
@@ -53,7 +53,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/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
 Fri Jun  1 16:13:57 2018
@@ -55,7 +55,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 String loginConfigName = Constants.DEFAULT_LOGIN_MODULE_NAME;
     public String getLoginConfigName() {

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java 
Fri Jun  1 16:13:57 2018
@@ -62,7 +62,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/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri 
Jun  1 16:13:57 2018
@@ -76,7 +76,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/tc8.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CorsFilter.java Fri 
Jun  1 16:13:57 2018
@@ -78,7 +78,7 @@ import org.apache.tomcat.util.res.String
  */
 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);
 
 

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java 
Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java 
Fri Jun  1 16:13:57 2018
@@ -48,7 +48,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/tc8.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java 
Fri Jun  1 16:13:57 2018
@@ -41,7 +41,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/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java 
Fri Jun  1 16:13:57 2018
@@ -41,7 +41,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/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java 
Fri Jun  1 16:13:57 2018
@@ -653,7 +653,7 @@ public class RemoteIpFilter implements F
 
     // 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/tc8.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java 
Fri Jun  1 16:13:57 2018
@@ -65,7 +65,7 @@ public class RequestDumperFilter impleme
 
     // 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/tc8.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java 
Fri Jun  1 16:13:57 2018
@@ -39,7 +39,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/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
 Fri Jun  1 16:13:57 2018
@@ -51,7 +51,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/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
 Fri Jun  1 16:13:57 2018
@@ -60,7 +60,7 @@ public abstract class AbstractReplicated
     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.

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
 Fri Jun  1 16:13:57 2018
@@ -64,7 +64,7 @@ import org.apache.juli.logging.LogFactor
  */
 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
 
 
 
//------------------------------------------------------------------------------

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java 
Fri Jun  1 16:13:57 2018
@@ -57,7 +57,7 @@ public class ReplicatedMap<K,V> extends
 
     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

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java 
Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Fri 
Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspConfig.java Fri Jun 
 1 16:13:57 2018
@@ -40,7 +40,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/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java Fri Jun 
 1 16:13:57 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/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
Fri Jun  1 16:13:57 2018
@@ -60,7 +60,7 @@ import org.apache.juli.logging.LogFactor
 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/tc8.0.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JasperInitializer.java 
Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java 
Fri Jun  1 16:13:57 2018
@@ -79,7 +79,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/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/servlet/TldScanner.java Fri Jun 
 1 16:13:57 2018
@@ -55,7 +55,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/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java 
Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
Fri Jun  1 16:13:57 2018
@@ -62,7 +62,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
     // be unique. Duplicates normally trigger an error. This flag indicates if

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
 Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri 
Jun  1 16:13:57 2018
@@ -1037,7 +1037,7 @@ public class AprEndpoint extends Abstrac
      */
     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() {

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 
Fri Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameClient.java 
Fri Jun  1 16:13:57 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(Constants.PACKAGE_NAME);
 

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
 Fri Jun  1 16:13:57 2018
@@ -59,7 +59,7 @@ public abstract class WsRemoteEndpointIm
     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();
 

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java Fri 
Jun  1 16:13:57 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/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
Fri Jun  1 16:13:57 2018
@@ -118,7 +118,7 @@ public class WsWebSocketContainer
     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/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
 Fri Jun  1 16:13:57 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(Constants.PACKAGE_NAME);
 

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java 
(original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsFrameServer.java 
Fri Jun  1 16:13:57 2018
@@ -30,7 +30,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(Constants.PACKAGE_NAME);
 
     private final ServletInputStream sis;

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
 Fri Jun  1 16:13:57 2018
@@ -46,7 +46,7 @@ import org.apache.tomcat.websocket.WsSes
  */
 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;

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
 Fri Jun  1 16:13:57 2018
@@ -43,7 +43,7 @@ public class WsRemoteEndpointImplServer
 
     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<>();

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1832701&r1=1832700&r2=1832701&view=diff
==============================================================================
--- 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
 (original)
+++ 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
 Fri Jun  1 16:13:57 2018
@@ -74,7 +74,7 @@ public class WsServerContainer extends W
 
     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,



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to