Author: markt
Date: Thu May 24 12:57:24 2018
New Revision: 1832160
URL: http://svn.apache.org/viewvc?rev=1832160&view=rev
Log:
Logs for Filters must be non-static as loggers are created per class-loader and
Filters may be used in multiple class loaders.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.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/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
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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
Thu May 24 12:57:24 2018
@@ -47,8 +47,9 @@ import org.apache.juli.logging.LogFactor
*/
public class AddDefaultCharsetFilter extends FilterBase {
- private static final Log log =
- LogFactory.getLog(AddDefaultCharsetFilter.class);
+ // 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 static final String DEFAULT_ENCODING = "ISO-8859-1";
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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
Thu May 24 12:57:24 2018
@@ -29,7 +29,9 @@ import org.apache.juli.logging.LogFactor
public abstract class CsrfPreventionFilterBase extends FilterBase {
- private static final Log log =
LogFactory.getLog(CsrfPreventionFilterBase.class);
+ // 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 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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Thu May 24
12:57:24 2018
@@ -1050,7 +1050,9 @@ public class ExpiresFilter extends Filte
private static final String HEADER_LAST_MODIFIED = "Last-Modified";
- private static final Log log = LogFactory.getLog(ExpiresFilter.class);
+ // 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 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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java Thu
May 24 12:57:24 2018
@@ -43,7 +43,9 @@ import org.apache.tomcat.util.http.Param
*/
public class FailedRequestFilter extends FilterBase {
- private static final Log log =
LogFactory.getLog(FailedRequestFilter.class);
+ // 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);
@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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
Thu May 24 12:57:24 2018
@@ -36,7 +36,9 @@ import org.apache.juli.logging.LogFactor
*/
public class HttpHeaderSecurityFilter extends FilterBase {
- private static final Log log =
LogFactory.getLog(HttpHeaderSecurityFilter.class);
+ // 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);
// 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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java Thu May
24 12:57:24 2018
@@ -33,18 +33,11 @@ import org.apache.juli.logging.LogFactor
* @author Craig R. McClanahan
*
*/
-
public final class RemoteAddrFilter extends RequestFilter {
- // ----------------------------------------------------- Instance Variables
- private static final Log log = LogFactory.getLog(RemoteAddrFilter.class);
-
-
- // ------------------------------------------------------------- Properties
-
-
-
- // --------------------------------------------------------- Public Methods
+ // 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);
/**
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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java Thu May
24 12:57:24 2018
@@ -35,12 +35,10 @@ import org.apache.juli.logging.LogFactor
*/
public final class RemoteHostFilter extends RequestFilter {
- // ----------------------------------------------------- Instance Variables
+ // 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 static final Log log = LogFactory.getLog(RemoteHostFilter.class);
-
-
- // --------------------------------------------------------- Public Methods
/**
* Extract the desired request property, and pass it (along with the
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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Thu May
24 12:57:24 2018
@@ -652,10 +652,9 @@ public class RemoteIpFilter extends Gene
protected static final String INTERNAL_PROXIES_PARAMETER =
"internalProxies";
- /**
- * Logger
- */
- private static final Log log = LogFactory.getLog(RemoteIpFilter.class);
+ // 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);
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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Thu
May 24 12:57:24 2018
@@ -64,10 +64,9 @@ public class RequestDumperFilter extends
}
};
- /**
- * The logger for this class.
- */
- private static final Log log =
LogFactory.getLog(RequestDumperFilter.class);
+ // 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);
/**
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=1832160&r1=1832159&r2=1832160&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
Thu May 24 12:57:24 2018
@@ -54,8 +54,9 @@ import org.apache.juli.logging.LogFactor
*/
public class SetCharacterEncodingFilter extends FilterBase {
- private static final Log log =
- LogFactory.getLog(SetCharacterEncodingFilter.class);
+ // 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);
// ----------------------------------------------------- Instance Variables
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
