svn commit: r884916 - /tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java

[markt]

Author: markt
Date: Fri Nov 27 17:24:47 2009
New Revision: 884916

URL: http://svn.apache.org/viewvc?rev=884916&view=rev
Log:
Re-order the numbering so each dispatcher type always refers to the same bit so 
we can use bitwise operations

Modified:
    tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java

Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java?rev=884916&r1=884915&r2=884916&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Fri Nov 27 
17:24:47 2009
@@ -53,16 +53,16 @@
     public static final int FORWARD_ERROR =3;  
     public static final int INCLUDE = 4;
     public static final int INCLUDE_ERROR  = 5;
-    public static final int INCLUDE_ERROR_FORWARD  =6;
-    public static final int INCLUDE_FORWARD  = 7;
+    public static final int INCLUDE_FORWARD  = 6;
+    public static final int INCLUDE_ERROR_FORWARD  =7;
     public static final int REQUEST = 8;
     public static final int REQUEST_ERROR = 9;
-    public static final int REQUEST_ERROR_FORWARD = 10;
-    public static final int REQUEST_ERROR_FORWARD_INCLUDE = 11;
-    public static final int REQUEST_ERROR_INCLUDE = 12;
-    public static final int REQUEST_FORWARD = 13;
-    public static final int REQUEST_INCLUDE = 14;
-    public static final int REQUEST_FORWARD_INCLUDE= 15;
+    public static final int REQUEST_FORWARD = 10;
+    public static final int REQUEST_ERROR_FORWARD = 11;
+    public static final int REQUEST_INCLUDE = 12;
+    public static final int REQUEST_ERROR_INCLUDE = 13;
+    public static final int REQUEST_FORWARD_INCLUDE= 14;
+    public static final int REQUEST_ERROR_FORWARD_INCLUDE = 15;
     
     // represents nothing having been set. This will be seen 
     // as equal to a REQUEST
@@ -221,7 +221,8 @@
         // per the SRV.6.2.5 absence of any dispatcher elements is
         // equivalent to a REQUEST value
         if (dispatcherMapping == NOT_SET) return REQUEST;
-        else return dispatcherMapping; 
+        
+        return dispatcherMapping; 
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org