remm 2003/11/26 16:29:15
Modified: catalina/src/share/org/apache/catalina/valves ValveBase.java
Log:
- Fix sequence generator when there are duplicate valves in the pipeline.
- Thanks to Peter Rossbach for the help.
Revision Changes Path
1.10 +8 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java
Index: ValveBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ValveBase.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ValveBase.java 2 Sep 2003 21:22:03 -0000 1.9
+++ ValveBase.java 27 Nov 2003 00:29:15 -0000 1.10
@@ -311,9 +311,11 @@
int seq=0;
for( int i=0; i<valves.length; i++ ) {
// Find other valves with the same name
+ if (valves[i] == this) {
+ break;
+ }
if( valves[i]!=null &&
- valves[i].getClass() == this.getClass() &&
- valves[i] != this ) {
+ valves[i].getClass() == this.getClass() ) {
log.debug("Duplicate " + valves[i] + " " + this + " " + container);
seq++;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
