[jboss-cvs] JBossAS SVN: r95432 - branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/security.

[jboss-cvs-commits at lists.jboss.org]

Author: sguilhen at redhat.com
Date: 2009-10-22 13:27:45 -0400 (Thu, 22 Oct 2009)
New Revision: 95432

Modified:
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java
Log:
JBAS-7326: JaccContextValve now also sets the response in ActiveRequestResponseCacheValve, just as it does with the request.

Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java	2009-10-22 17:19:58 UTC (rev 95431)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java	2009-10-22 17:27:45 UTC (rev 95432)
@@ -89,6 +89,8 @@
          HttpServletRequestPolicyContextHandler.setRequest(httpRequest);
          if(ActiveRequestResponseCacheValve.activeRequest.get() == null)
             ActiveRequestResponseCacheValve.activeRequest.set(request);
+         if(ActiveRequestResponseCacheValve.activeResponse.get() == null)
+            ActiveRequestResponseCacheValve.activeResponse.set(response);
          // Perform the request
          getNext().invoke(request, response);
       }
@@ -96,6 +98,7 @@
       {
          SecurityAssociationValve.activeWebMetaData.set(null);
          ActiveRequestResponseCacheValve.activeRequest.set(null);
+         ActiveRequestResponseCacheValve.activeResponse.set(null);
          SecurityAssociationActions.clear();
          activeCS.set(null);
          SecurityRolesAssociation.setSecurityRoles(null);
@@ -124,6 +127,8 @@
          HttpServletRequestPolicyContextHandler.setRequest(httpRequest);
          if(ActiveRequestResponseCacheValve.activeRequest.get() == null)
             ActiveRequestResponseCacheValve.activeRequest.set(request);
+         if(ActiveRequestResponseCacheValve.activeResponse.get() == null)
+            ActiveRequestResponseCacheValve.activeResponse.set(response);
          // Perform the request
          getNext().event(request, response, event);
       }
@@ -131,6 +136,7 @@
       {
          SecurityAssociationValve.activeWebMetaData.set(null);
          ActiveRequestResponseCacheValve.activeRequest.set(null);
+         ActiveRequestResponseCacheValve.activeResponse.set(null);
          SecurityAssociationActions.clear();
          activeCS.set(null);
          SecurityRolesAssociation.setSecurityRoles(null);