Author: markt
Date: Fri Feb 12 12:17:43 2016
New Revision: 1730008
URL: http://svn.apache.org/viewvc?rev=1730008&view=rev
Log:
Clean-up & re-order
No measurable performance improvement
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.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=1730008&r1=1730007&r2=1730008&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Fri Feb 12 12:17:43 2016
@@ -50,22 +50,8 @@ public final class ApplicationFilterFact
* @return The configured FilterChain instance or null if none is to be
* executed.
*/
- public static ApplicationFilterChain createFilterChain
- (ServletRequest request, Wrapper wrapper, Servlet servlet) {
-
- // get the dispatcher type
- DispatcherType dispatcher = null;
- if (request.getAttribute(Globals.DISPATCHER_TYPE_ATTR) != null) {
- dispatcher = (DispatcherType) request.getAttribute(
- Globals.DISPATCHER_TYPE_ATTR);
- }
- String requestPath = null;
- Object attribute = request.getAttribute(
- Globals.DISPATCHER_REQUEST_PATH_ATTR);
-
- if (attribute != null){
- requestPath = attribute.toString();
- }
+ public static ApplicationFilterChain createFilterChain(ServletRequest
request,
+ Wrapper wrapper, Servlet servlet) {
// If there is no servlet to execute, return null
if (servlet == null)
@@ -102,6 +88,15 @@ public final class ApplicationFilterFact
return (filterChain);
// Acquire the information we will need to match filter mappings
+ DispatcherType dispatcher =
+ (DispatcherType)
request.getAttribute(Globals.DISPATCHER_TYPE_ATTR);
+
+ String requestPath = null;
+ Object attribute =
request.getAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR);
+ if (attribute != null){
+ requestPath = attribute.toString();
+ }
+
String servletName = wrapper.getName();
// Add the relevant path-mapped filters to this filter chain
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
