Author: markt
Date: Fri Nov 27 18:01:12 2009
New Revision: 884926
URL: http://svn.apache.org/viewvc?rev=884926&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48285
Add handling of Async dispatcher types
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=884926&r1=884925&r2=884926&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Fri Nov 27 18:01:12 2009
@@ -354,6 +354,12 @@
}
break;
}
+ case ASYNC : {
+ if ((filterMap.getDispatcherMapping() & FilterMap.ASYNC) > 0) {
+ return true;
+ }
+ break;
+ }
}
return false;
}
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=884926&r1=884925&r2=884926&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Fri Nov 27
18:01:12 2009
@@ -52,6 +52,7 @@
public static final int FORWARD = 2;
public static final int INCLUDE = 4;
public static final int REQUEST = 8;
+ public static final int ASYNC = 16;
// represents nothing having been set. This will be seen
// as equal to a REQUEST
@@ -134,22 +135,7 @@
/**
*
* This method will be used to set the current state of the FilterMap
- * representing the state of when filters should be applied:
- *
- * ERROR
- * FORWARD
- * FORWARD_ERROR
- * INCLUDE
- * INCLUDE_ERROR
- * INCLUDE_ERROR_FORWARD
- * REQUEST
- * REQUEST_ERROR
- * REQUEST_ERROR_INCLUDE
- * REQUEST_ERROR_FORWARD_INCLUDE
- * REQUEST_INCLUDE
- * REQUEST_FORWARD,
- * REQUEST_FORWARD_INCLUDE
- *
+ * representing the state of when filters should be applied.
*/
public void setDispatcher(String dispatcherString) {
String dispatcher = dispatcherString.toUpperCase();
@@ -166,6 +152,9 @@
} else if (dispatcher.equals(DispatcherType.ERROR.name())) {
// apply ERROR to the global dispatcherMapping.
dispatcherMapping |= ERROR;
+ } else if (dispatcher.equals(DispatcherType.ASYNC.name())) {
+ // apply ERROR to the global dispatcherMapping.
+ dispatcherMapping |= ASYNC;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
