Author: markt
Date: Fri Nov 27 17:52:25 2009
New Revision: 884923
URL: http://svn.apache.org/viewvc?rev=884923&view=rev
Log:
Take advantage of revised constants to simplify code
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=884923&r1=884922&r2=884923&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Fri Nov 27 17:52:25 2009
@@ -54,11 +54,8 @@
// ----------------------------------------------------------- Constructors
-
- /*
- * Prevent instantiation outside of the getInstanceMethod().
- */
private ApplicationFilterFactory() {
+ // Prevent instantiation outside of the getInstanceMethod().
}
@@ -334,54 +331,26 @@
private boolean matchDispatcher(FilterMap filterMap, DispatcherType type) {
switch (type) {
case FORWARD : {
- if (filterMap.getDispatcherMapping() == FilterMap.FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.FORWARD_ERROR ||
- filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD_INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD_INCLUDE) {
+ if ((filterMap.getDispatcherMapping() & FilterMap.FORWARD) >
0) {
return true;
}
break;
}
case INCLUDE : {
- if (filterMap.getDispatcherMapping() == FilterMap.INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR ||
- filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD_INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD_INCLUDE) {
- return true;
+ if ((filterMap.getDispatcherMapping() & FilterMap.INCLUDE) >
0) {
+ return true;
}
break;
}
case REQUEST : {
- if (filterMap.getDispatcherMapping() == FilterMap.REQUEST ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_FORWARD_INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD_INCLUDE) {
- return true;
+ if ((filterMap.getDispatcherMapping() & FilterMap.REQUEST) >
0) {
+ return true;
}
break;
}
case ERROR : {
- if (filterMap.getDispatcherMapping() == FilterMap.ERROR ||
- filterMap.getDispatcherMapping() ==
FilterMap.FORWARD_ERROR ||
- filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR ||
- filterMap.getDispatcherMapping() ==
FilterMap.INCLUDE_ERROR_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_FORWARD_INCLUDE ||
- filterMap.getDispatcherMapping() ==
FilterMap.REQUEST_ERROR_INCLUDE) {
- return true;
+ if ((filterMap.getDispatcherMapping() & FilterMap.ERROR) > 0) {
+ return true;
}
break;
}
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=884923&r1=884922&r2=884923&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:52:25 2009
@@ -66,9 +66,9 @@
// represents nothing having been set. This will be seen
// as equal to a REQUEST
- private static final int NOT_SET = -1;
+ private static final int NOT_SET = 0;
- private int dispatcherMapping=NOT_SET;
+ private int dispatcherMapping = NOT_SET;
private String filterName = null;
@@ -166,54 +166,17 @@
String dispatcher = dispatcherString.toUpperCase();
if (dispatcher.equals(DispatcherType.FORWARD.name())) {
-
// apply FORWARD to the global dispatcherMapping.
- switch (dispatcherMapping) {
- case NOT_SET : dispatcherMapping = FORWARD; break;
- 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;
- case REQUEST_ERROR : dispatcherMapping =
REQUEST_ERROR_FORWARD; break;
- case REQUEST_ERROR_INCLUDE : dispatcherMapping =
REQUEST_ERROR_FORWARD_INCLUDE; break;
- case REQUEST_INCLUDE : dispatcherMapping =
REQUEST_FORWARD_INCLUDE; break;
- }
+ dispatcherMapping |= FORWARD;
} else if (dispatcher.equals(DispatcherType.INCLUDE.name())) {
// apply INCLUDE to the global dispatcherMapping.
- switch (dispatcherMapping) {
- case NOT_SET : dispatcherMapping = INCLUDE; break;
- 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;
- case REQUEST_ERROR : dispatcherMapping =
REQUEST_ERROR_INCLUDE; break;
- case REQUEST_ERROR_FORWARD : dispatcherMapping =
REQUEST_ERROR_FORWARD_INCLUDE; break;
- case REQUEST_FORWARD : dispatcherMapping =
REQUEST_FORWARD_INCLUDE; break;
- }
+ dispatcherMapping |= INCLUDE;
} else if (dispatcher.equals(DispatcherType.REQUEST.name())) {
// apply REQUEST to the global dispatcherMapping.
- switch (dispatcherMapping) {
- case NOT_SET : dispatcherMapping = REQUEST; break;
- 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;
- case INCLUDE_ERROR : dispatcherMapping =
REQUEST_ERROR_INCLUDE; break;
- case INCLUDE_FORWARD : dispatcherMapping =
REQUEST_FORWARD_INCLUDE; break;
- case INCLUDE_ERROR_FORWARD : dispatcherMapping =
REQUEST_ERROR_FORWARD_INCLUDE; break;
- }
+ dispatcherMapping |= REQUEST;
} else if (dispatcher.equals(DispatcherType.ERROR.name())) {
// apply ERROR to the global dispatcherMapping.
- switch (dispatcherMapping) {
- case NOT_SET : dispatcherMapping = ERROR; break;
- 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; 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;
- }
+ dispatcherMapping |= ERROR;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
