From: fhanik Date: Fri, 9 Oct 2009 22:02:35 +0000 (+0000) Subject: Explicitly mark all our valves so that we can track down which ones we need to fix... X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9036dcc2fb80760e466952fa89bca09ce4e57975;p=tomcat7.0 Explicitly mark all our valves so that we can track down which ones we need to fix and make async aware git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@823713 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java index 0ea4832ff..ae7ef6422 100644 --- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -80,6 +80,11 @@ public abstract class AuthenticatorBase private static Log log = LogFactory.getLog(AuthenticatorBase.class); + //------------------------------------------------------ Constructor + public AuthenticatorBase() { + super(true); + } + // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java b/java/org/apache/catalina/authenticator/SingleSignOn.java index e76d6dc3b..820c87baa 100644 --- a/java/org/apache/catalina/authenticator/SingleSignOn.java +++ b/java/org/apache/catalina/authenticator/SingleSignOn.java @@ -66,6 +66,10 @@ public class SingleSignOn extends ValveBase implements Lifecycle, SessionListener { + //------------------------------------------------------ Constructor + public SingleSignOn() { + super(true); + } // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java index e6be2d8de..d8b6ce6cc 100644 --- a/java/org/apache/catalina/core/StandardContextValve.java +++ b/java/org/apache/catalina/core/StandardContextValve.java @@ -51,6 +51,10 @@ import org.apache.tomcat.util.buf.MessageBytes; final class StandardContextValve extends ValveBase { + //------------------------------------------------------ Constructor + public StandardContextValve() { + super(true); + } // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/core/StandardEngineValve.java b/java/org/apache/catalina/core/StandardEngineValve.java index b48d5f215..328991686 100644 --- a/java/org/apache/catalina/core/StandardEngineValve.java +++ b/java/org/apache/catalina/core/StandardEngineValve.java @@ -46,6 +46,11 @@ import org.apache.catalina.valves.ValveBase; final class StandardEngineValve extends ValveBase { + //------------------------------------------------------ Constructor + public StandardEngineValve() { + super(true); + } + // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/core/StandardHostValve.java b/java/org/apache/catalina/core/StandardHostValve.java index 32354ad11..860caf8fd 100644 --- a/java/org/apache/catalina/core/StandardHostValve.java +++ b/java/org/apache/catalina/core/StandardHostValve.java @@ -59,6 +59,11 @@ final class StandardHostValve private static Log log = LogFactory.getLog(StandardHostValve.class); + //------------------------------------------------------ Constructor + public StandardHostValve() { + super(true); + } + // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java b/java/org/apache/catalina/core/StandardWrapperValve.java index 3f8a2761f..43a949d4c 100644 --- a/java/org/apache/catalina/core/StandardWrapperValve.java +++ b/java/org/apache/catalina/core/StandardWrapperValve.java @@ -52,6 +52,11 @@ import org.apache.tomcat.util.log.SystemLogHandler; final class StandardWrapperValve extends ValveBase { + //------------------------------------------------------ Constructor + public StandardWrapperValve() { + super(true); + } + // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java index 1befc3a49..6077802d6 100644 --- a/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java +++ b/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java @@ -108,6 +108,11 @@ public class JvmRouteBinderValve extends ValveBase implements ClusterValve, Life */ protected static final String info = "org.apache.catalina.ha.session.JvmRouteBinderValve/1.2"; + //------------------------------------------------------ Constructor + public JvmRouteBinderValve() { + super(false); + } + /*--Instance Variables--------------------------------------*/ /** diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java index 6cdee0657..043149fb4 100644 --- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java +++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java @@ -125,6 +125,7 @@ public class ReplicationValve // ------------------------------------------------------------- Properties public ReplicationValve() { + super(false); } /** diff --git a/java/org/apache/catalina/valves/AccessLogValve.java b/java/org/apache/catalina/valves/AccessLogValve.java index ecf1c69bf..1ce4fbdb4 100644 --- a/java/org/apache/catalina/valves/AccessLogValve.java +++ b/java/org/apache/catalina/valves/AccessLogValve.java @@ -125,6 +125,11 @@ public class AccessLogValve private static Log log = LogFactory.getLog(AccessLogValve.class); + //------------------------------------------------------ Constructor + public AccessLogValve() { + super(false); + } + // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/valves/CometConnectionManagerValve.java b/java/org/apache/catalina/valves/CometConnectionManagerValve.java index 2f6b4ba5d..22ddb06ed 100644 --- a/java/org/apache/catalina/valves/CometConnectionManagerValve.java +++ b/java/org/apache/catalina/valves/CometConnectionManagerValve.java @@ -57,6 +57,11 @@ import org.apache.tomcat.util.res.StringManager; public class CometConnectionManagerValve extends ValveBase implements Lifecycle, HttpSessionListener, LifecycleListener { + + //------------------------------------------------------ Constructor + public CometConnectionManagerValve() { + super(false); + } // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/valves/ErrorReportValve.java b/java/org/apache/catalina/valves/ErrorReportValve.java index 90394a910..c80d3fa97 100644 --- a/java/org/apache/catalina/valves/ErrorReportValve.java +++ b/java/org/apache/catalina/valves/ErrorReportValve.java @@ -51,6 +51,10 @@ import org.apache.tomcat.util.res.StringManager; public class ErrorReportValve extends ValveBase { + //------------------------------------------------------ Constructor + public ErrorReportValve() { + super(false); + } // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java b/java/org/apache/catalina/valves/JDBCAccessLogValve.java index a60a126f6..87f080ae9 100644 --- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java +++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java @@ -143,7 +143,7 @@ public final class JDBCAccessLogValve * */ public JDBCAccessLogValve() { - super(); + super(false); driverName = null; connectionURL = null; tableName = "access"; diff --git a/java/org/apache/catalina/valves/PersistentValve.java b/java/org/apache/catalina/valves/PersistentValve.java index 4552ed65b..944a4de8a 100644 --- a/java/org/apache/catalina/valves/PersistentValve.java +++ b/java/org/apache/catalina/valves/PersistentValve.java @@ -50,6 +50,10 @@ import org.apache.tomcat.util.res.StringManager; public class PersistentValve extends ValveBase { + //------------------------------------------------------ Constructor + public PersistentValve() { + super(false); + } // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/valves/RequestFilterValve.java b/java/org/apache/catalina/valves/RequestFilterValve.java index 74ec25c30..cb25eaede 100644 --- a/java/org/apache/catalina/valves/RequestFilterValve.java +++ b/java/org/apache/catalina/valves/RequestFilterValve.java @@ -68,6 +68,10 @@ import org.apache.tomcat.util.res.StringManager; public abstract class RequestFilterValve extends ValveBase { + //------------------------------------------------------ Constructor + public RequestFilterValve() { + super(true); + } // ----------------------------------------------------- Class Variables diff --git a/java/org/apache/catalina/valves/SSLValve.java b/java/org/apache/catalina/valves/SSLValve.java index ceec1196b..b9b1a2986 100644 --- a/java/org/apache/catalina/valves/SSLValve.java +++ b/java/org/apache/catalina/valves/SSLValve.java @@ -47,6 +47,14 @@ import org.apache.catalina.connector.Response; public class SSLValve extends ValveBase { + + + //------------------------------------------------------ Constructor + public SSLValve() { + super(true); + } + + public String mygetHeader(Request request, String header) { String strcert0 = request.getHeader(header); diff --git a/java/org/apache/catalina/valves/SemaphoreValve.java b/java/org/apache/catalina/valves/SemaphoreValve.java index 3886d412a..c991710a7 100644 --- a/java/org/apache/catalina/valves/SemaphoreValve.java +++ b/java/org/apache/catalina/valves/SemaphoreValve.java @@ -47,6 +47,10 @@ public class SemaphoreValve extends ValveBase implements Lifecycle { + //------------------------------------------------------ Constructor + public SemaphoreValve() { + super(false); //TODO - is this async aware + } // ----------------------------------------------------- Instance Variables diff --git a/java/org/apache/catalina/valves/ValveBase.java b/java/org/apache/catalina/valves/ValveBase.java index cbea0f15f..6344a86ef 100644 --- a/java/org/apache/catalina/valves/ValveBase.java +++ b/java/org/apache/catalina/valves/ValveBase.java @@ -59,13 +59,21 @@ public abstract class ValveBase implements Contained, Valve, MBeanRegistration { private static Log log = LogFactory.getLog(ValveBase.class); - //------------------------------------------------------ Instance Variables - + //------------------------------------------------------ Constructor + + public ValveBase() { + this(false); + } + + public ValveBase(boolean asyncSupported) { + this.asyncSupported = asyncSupported; + } + //------------------------------------------------------ Instance Variables /** * Does this valve support async reporting */ - protected boolean asyncSupported = false; + protected boolean asyncSupported; /** * The Container whose pipeline this Valve is a component of.