svn commit: r951980 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java

[markt]

Author: markt
Date: Sun Jun  6 21:21:51 2010
New Revision: 951980

URL: http://svn.apache.org/viewvc?rev=951980&view=rev
Log:
Additional fix required for http://svn.apache.org/viewvc?rev=951926&view=rev

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=951980&r1=951979&r2=951980&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Sun 
Jun  6 21:21:51 2010
@@ -60,7 +60,7 @@ final class ApplicationFilterChain imple
     private final static ThreadLocal<ServletResponse> lastServicedResponse;
 
     static {
-        if (Globals.STRICT_SERVLET_COMPLIANCE) {
+        if (ApplicationDispatcher.WRAP_SAME_OBJECT) {
             lastServicedRequest = new ThreadLocal<ServletRequest>();
             lastServicedResponse = new ThreadLocal<ServletResponse>();
         } else {
@@ -271,7 +271,7 @@ final class ApplicationFilterChain imple
 
         // We fell off the end of the chain -- call the servlet instance
         try {
-            if (Globals.STRICT_SERVLET_COMPLIANCE) {
+            if (ApplicationDispatcher.WRAP_SAME_OBJECT) {
                 lastServicedRequest.set(request);
                 lastServicedResponse.set(response);
             }
@@ -325,7 +325,7 @@ final class ApplicationFilterChain imple
             throw new ServletException
               (sm.getString("filterChain.servlet"), e);
         } finally {
-            if (Globals.STRICT_SERVLET_COMPLIANCE) {
+            if (ApplicationDispatcher.WRAP_SAME_OBJECT) {
                 lastServicedRequest.set(null);
                 lastServicedResponse.set(null);
             }



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