remm 2003/03/28 06:58:08
Modified: catalina/src/share/org/apache/catalina/core
StandardPipeline.java
Log:
- Valves registration should only happen on start/stop, otherwise, the container
hierarchy may not be initialized.
Revision Changes Path
1.7 +7 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java
Index: StandardPipeline.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StandardPipeline.java 27 Mar 2003 03:06:39 -0000 1.6
+++ StandardPipeline.java 28 Mar 2003 14:58:08 -0000 1.7
@@ -477,6 +477,8 @@
} catch (LifecycleException e) {
log.error("StandardPipeline.addValve: start: ", e);
}
+ // Register the newly added valve
+ registerValve(valve);
}
// Add this Valve to the set associated with this Pipeline
@@ -486,8 +488,6 @@
results[valves.length] = valve;
valves = results;
}
- // register the newly added valve
- registerValve(valve);
}
@@ -602,9 +602,9 @@
} catch (LifecycleException e) {
log.error("StandardPipeline.removeValve: stop: ", e);
}
+ // Unregister the removed valave
+ unregisterValve(valve);
}
- // unregister the removed valave
- unregisterValve(valve);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
