[jboss-cvs] JBossAS SVN: r99016 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/security.

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

Author: bstansberry at jboss.com
Date: 2010-01-05 00:47:47 -0500 (Tue, 05 Jan 2010)
New Revision: 99016

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/JaccContextValve.java
Log:
[JBAS-7595] Sync w/ 6.0.0.M1 tag

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/JaccContextValve.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/JaccContextValve.java	2010-01-05 05:26:07 UTC (rev 99015)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/security/JaccContextValve.java	2010-01-05 05:47:47 UTC (rev 99016)
@@ -88,7 +88,9 @@
          // Set the JACC HttpServletRequest PolicyContextHandler data
          HttpServletRequestPolicyContextHandler.setRequest(httpRequest);
          if(ActiveRequestResponseCacheValve.activeRequest.get() == null)
-        	 ActiveRequestResponseCacheValve.activeRequest.set(request);
+            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);
@@ -123,7 +126,9 @@
          // Set the JACC HttpServletRequest PolicyContextHandler data
          HttpServletRequestPolicyContextHandler.setRequest(httpRequest);
          if(ActiveRequestResponseCacheValve.activeRequest.get() == null)
-        	 ActiveRequestResponseCacheValve.activeRequest.set(request);
+            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);