You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2003/04/15 03:59:01 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy FilterMap.java
jfarcand 2003/04/14 18:59:00
Modified: catalina/src/share/org/apache/catalina/deploy FilterMap.java
Log:
Add missing break statement. That introduce very strange behaviour based on the order the < dispatcher > element is parsed by the digester.
Revision Changes Path
1.5 +11 -11 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/FilterMap.java
Index: FilterMap.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/deploy/FilterMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FilterMap.java 27 Jan 2003 23:45:19 -0000 1.4
+++ FilterMap.java 15 Apr 2003 01:59:00 -0000 1.5
@@ -178,7 +178,7 @@
// apply FORWARD to the global dispatcherMapping.
switch (dispatcherMapping) {
case NOT_SET : dispatcherMapping = FORWARD; break;
- case ERROR : dispatcherMapping = FORWARD_ERROR;
+ case ERROR : dispatcherMapping = FORWARD_ERROR; break;
case INCLUDE : dispatcherMapping = INCLUDE_FORWARD; break;
case INCLUDE_ERROR : dispatcherMapping = INCLUDE_ERROR_FORWARD; break;
case REQUEST : dispatcherMapping = REQUEST_FORWARD; break;
@@ -190,7 +190,7 @@
// apply INCLUDE to the global dispatcherMapping.
switch (dispatcherMapping) {
case NOT_SET : dispatcherMapping = INCLUDE; break;
- case ERROR : dispatcherMapping = INCLUDE_ERROR;
+ case ERROR : dispatcherMapping = INCLUDE_ERROR; break;
case FORWARD : dispatcherMapping = INCLUDE_FORWARD; break;
case FORWARD_ERROR : dispatcherMapping = INCLUDE_ERROR_FORWARD; break;
case REQUEST : dispatcherMapping = REQUEST_INCLUDE; break;
@@ -202,7 +202,7 @@
// apply REQUEST to the global dispatcherMapping.
switch (dispatcherMapping) {
case NOT_SET : dispatcherMapping = REQUEST; break;
- case ERROR : dispatcherMapping = REQUEST_ERROR;
+ case ERROR : dispatcherMapping = REQUEST_ERROR; break;
case FORWARD : dispatcherMapping = REQUEST_FORWARD; break;
case FORWARD_ERROR : dispatcherMapping = REQUEST_ERROR_FORWARD; break;
case INCLUDE : dispatcherMapping = REQUEST_INCLUDE; break;
@@ -217,10 +217,10 @@
case FORWARD : dispatcherMapping = FORWARD_ERROR; break;
case INCLUDE : dispatcherMapping = INCLUDE_ERROR; break;
case INCLUDE_FORWARD : dispatcherMapping = INCLUDE_ERROR_FORWARD; break;
- case REQUEST : dispatcherMapping = REQUEST_ERROR;
- case REQUEST_INCLUDE : dispatcherMapping = REQUEST_ERROR_INCLUDE;
- case REQUEST_FORWARD : dispatcherMapping = REQUEST_ERROR_FORWARD;
- case REQUEST_FORWARD_INCLUDE : dispatcherMapping = REQUEST_ERROR_FORWARD_INCLUDE;
+ case REQUEST : dispatcherMapping = REQUEST_ERROR; break;
+ case REQUEST_INCLUDE : dispatcherMapping = REQUEST_ERROR_INCLUDE; break;
+ case REQUEST_FORWARD : dispatcherMapping = REQUEST_ERROR_FORWARD; break;
+ case REQUEST_FORWARD_INCLUDE : dispatcherMapping = REQUEST_ERROR_FORWARD_INCLUDE; break;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org