On 09/10/2009, fha...@apache.org <fha...@apache.org> wrote: > Author: fhanik > Date: Fri Oct 9 22:02:35 2009 > New Revision: 823713 > > URL: http://svn.apache.org/viewvc?rev=823713&view=rev > Log: > Explicitly mark all our valves so that we can track down which ones we need > to fix and make async aware > > > > Modified: > tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java > tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java > tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java > tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java > tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java > tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java > tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java > tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java > tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java > > tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java > tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java > tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java > tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java > tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java > tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java > tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java > tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java > > Modified: > tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- > tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java > (original) > +++ > tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java > Fri Oct 9 22:02:35 2009 > @@ -80,6 +80,11 @@ > private static Log log = LogFactory.getLog(AuthenticatorBase.class); > > > + //------------------------------------------------------ Constructor > + public AuthenticatorBase() { > + super(true); > + } > + > // ----------------------------------------------------- Instance > Variables > > > > Modified: > tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java > Fri Oct 9 22:02:35 2009 > @@ -66,6 +66,10 @@ > extends ValveBase > implements Lifecycle, SessionListener { > > + //------------------------------------------------------ Constructor > + public SingleSignOn() { > + super(true); > + } > > // ----------------------------------------------------- Instance > Variables > > > Modified: > tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java Fri > Oct 9 22:02:35 2009 > @@ -51,6 +51,10 @@ > final class StandardContextValve > extends ValveBase { > > + //------------------------------------------------------ Constructor > + public StandardContextValve() { > + super(true); > + } > > // ----------------------------------------------------- Instance > Variables > > > Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/core/StandardEngineValve.java Fri > Oct 9 22:02:35 2009 > @@ -46,6 +46,11 @@ > final class StandardEngineValve > extends ValveBase { > > + //------------------------------------------------------ Constructor > + public StandardEngineValve() { > + super(true); > + } > + > > // ----------------------------------------------------- Instance > Variables > > > Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Fri > Oct 9 22:02:35 2009 > @@ -59,6 +59,11 @@ > > private static Log log = LogFactory.getLog(StandardHostValve.class); > > + //------------------------------------------------------ Constructor > + public StandardHostValve() { > + super(true); > + } > + > // ----------------------------------------------------- Instance > Variables > > > > Modified: > tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Fri > Oct 9 22:02:35 2009 > @@ -52,6 +52,11 @@ > final class StandardWrapperValve > extends ValveBase { > > + //------------------------------------------------------ Constructor > + public StandardWrapperValve() { > + super(true); > + } > + > // ----------------------------------------------------- Instance > Variables > > > > Modified: > tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- > tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java > (original) > +++ > tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Fri > Oct 9 22:02:35 2009 > @@ -108,6 +108,11 @@ > */ > protected static final String info = > "org.apache.catalina.ha.session.JvmRouteBinderValve/1.2"; > > + //------------------------------------------------------ Constructor > + public JvmRouteBinderValve() { > + super(false); > + } > + > /*--Instance Variables--------------------------------------*/ > > /** > > Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Fri > Oct 9 22:02:35 2009 > @@ -125,6 +125,7 @@ > // ------------------------------------------------------------- > Properties > > public ReplicationValve() { > + super(false); > } > > /** > > Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Fri Oct > 9 22:02:35 2009 > @@ -125,6 +125,11 @@ > > private static Log log = LogFactory.getLog(AccessLogValve.class); > > + //------------------------------------------------------ Constructor > + public AccessLogValve() { > + super(false); > + } > + > // ----------------------------------------------------- Instance > Variables > > > > Modified: > tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- > tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java > (original) > +++ > tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java > Fri Oct 9 22:02:35 2009 > @@ -57,6 +57,11 @@ > public class CometConnectionManagerValve > extends ValveBase > implements Lifecycle, HttpSessionListener, LifecycleListener { > + > + //------------------------------------------------------ Constructor > + public CometConnectionManagerValve() { > + super(false); > + } > > > // ----------------------------------------------------- Instance > Variables > > Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Fri > Oct 9 22:02:35 2009 > @@ -51,6 +51,10 @@ > public class ErrorReportValve > extends ValveBase { > > + //------------------------------------------------------ Constructor > + public ErrorReportValve() { > + super(false); > + } > > // ----------------------------------------------------- Instance > Variables > > > Modified: > tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Fri > Oct 9 22:02:35 2009 > @@ -143,7 +143,7 @@ > * </pre> > */ > public JDBCAccessLogValve() { > - super(); > + super(false); > driverName = null; > connectionURL = null; > tableName = "access"; > > Modified: tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java Fri > Oct 9 22:02:35 2009 > @@ -50,6 +50,10 @@ > public class PersistentValve > extends ValveBase { > > + //------------------------------------------------------ Constructor > + public PersistentValve() { > + super(false); > + } > > // ----------------------------------------------------- Instance > Variables > > > Modified: > tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Fri > Oct 9 22:02:35 2009 > @@ -68,6 +68,10 @@ > public abstract class RequestFilterValve > extends ValveBase { > > + //------------------------------------------------------ Constructor > + public RequestFilterValve() { > + super(true); > + } > > // ----------------------------------------------------- Class Variables > > > Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original) > +++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Fri Oct 9 > 22:02:35 2009 > @@ -47,6 +47,14 @@ > > public class SSLValve > extends ValveBase { > + > + > + //------------------------------------------------------ Constructor > + public SSLValve() { > + super(true); > + } > + > + > > public String mygetHeader(Request request, String header) { > String strcert0 = request.getHeader(header); > > Modified: tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java Fri Oct > 9 22:02:35 2009 > @@ -47,6 +47,10 @@ > extends ValveBase > implements Lifecycle { > > + //------------------------------------------------------ Constructor > + public SemaphoreValve() { > + super(false); //TODO - is this async aware > + } > > // ----------------------------------------------------- Instance > Variables > > > Modified: tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java?rev=823713&r1=823712&r2=823713&view=diff > > ============================================================================== > --- tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java (original) > +++ tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java Fri Oct 9 > 22:02:35 2009 > @@ -59,13 +59,21 @@ > 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;
This field [c|sh]ould be final. > /** > * The Container whose pipeline this Valve is a component of. > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
