Author: markt
Date: Sat Mar 6 09:26:33 2010
New Revision: 919722
URL: http://svn.apache.org/viewvc?rev=919722&view=rev
Log:
Fix some inconsistencies identified during lifecycle refactoring for valves
- don't start a basic valve when adding it to the pipeline if the pipeline is
not started
- if pipeline is started when adding a basic valve, register the basic valve
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=919722&r1=919721&r2=919722&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Sat Mar 6
09:26:33 2010
@@ -326,13 +326,15 @@
if (valve instanceof Contained) {
((Contained) valve).setContainer(this.container);
}
- if (valve instanceof Lifecycle) {
+ if (getState().isAvailable() && valve instanceof Lifecycle) {
try {
((Lifecycle) valve).start();
} catch (LifecycleException e) {
log.error("StandardPipeline.setBasic: start", e);
return;
}
+ // Register the newly added valve
+ registerValve(valve);
}
// Update the pipeline
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
