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

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@951980 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java
index 24cc305..54a9478 100644 (file)
--- a/java/org/apache/catalina/core/ApplicationFilterChain.java
+++ b/java/org/apache/catalina/core/ApplicationFilterChain.java
@@ -60,7 +60,7 @@ final class ApplicationFilterChain implements FilterChain, CometFilterChain {
     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 implements FilterChain, CometFilterChain {
 
         // 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 implements FilterChain, CometFilterChain {
             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);
             }