From af1b83d80d6ef3cb637cc5d79ddada2e8bde78a9 Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 6 Jun 2010 21:21:51 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/core/ApplicationFilterChain.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java index 24cc30528..54a947893 100644 --- 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 lastServicedResponse; static { - if (Globals.STRICT_SERVLET_COMPLIANCE) { + if (ApplicationDispatcher.WRAP_SAME_OBJECT) { lastServicedRequest = new ThreadLocal(); lastServicedResponse = new ThreadLocal(); } 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); } -- 2.11.0