[jboss-cvs] JBossAS SVN: r112249 - in branches/JBPAPP_5_1_0_Final_JBPAPP-7211: cluster/src/etc and 36 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 16 08:23:57 EDT 2011
Author: mmusaji
Date: 2011-09-16 08:23:56 -0400 (Fri, 16 Sep 2011)
New Revision: 112249
Modified:
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/.gitignore
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/etc/hapartition-jboss-beans.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/main/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/main/org/jboss/ha/framework/server/lock/ClusterLockState.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/main/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/main/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/connector/src/main/org/jboss/resource/connectionmanager/xa/XAResourceWrapperImpl.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/connector/src/main/org/jboss/resource/connectionmanager/xa/XidWrapperImpl.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/main/src/bin/run.conf.bat
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/messaging/src/main/org/jboss/jms/server/destination/QueueMODefinition.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/aop.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/classloader.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/deployers.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/jmx.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/logging.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/vfs.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/java.policy
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/jax-ws-catalog.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/jboss-log4j.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/jboss-service.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/login-config.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/props/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/standardjboss.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/standardjbosscmp-jdbc.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/xmdesc/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/minimal/bootstrap.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/minimal/jboss-service.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/deploy/legacy-invokers-service.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/deployers/logbridge-jboss-beans.xml
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/main/org/jboss/deployment/FileNameVirtualFileFilter.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/main/org/jboss/system/server/profileservice/repository/AbstractBootstrapProfileFactory.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/common/profiles/clustering.profile
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/common/profiles/ejb3.profile
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/common/profiles/jboss-web.profile
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/config/profiles/default.profile
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/config/profiles/seam.profile
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb2/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb3/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/sar/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/servlet/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/test/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/classloader/leak/test/Ejb3ClassloaderLeakTestBase.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/classloader/leak/test/IsolatedEarWithDualCommonsLoggingClassloaderLeakTestCase.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/classloader/leak/test/J2EEClassloaderLeakTestBase.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/J2EEClassloaderLeakTestBase.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/YieldingGloballyExclusiveClusterLockSupportUnitTestCase.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/cluster/web/notification/SessionSpecListenerAttribute.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/ejb3/common/AbstractReplierMDB.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/ejb3/common/EJB3TestCase.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/TransactionMDB.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/unit/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/spring/test/SpringFacadeTestCase.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/resources/bootstrapdependencies/jbas5349/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tools/buildmagic/lib/
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/varia/src/main/org/jboss/services/binding/managed/ServiceBindingMapper.java
branches/JBPAPP_5_1_0_Final_JBPAPP-7211/varia/src/resources/seam/jboss-structure.xml
Log:
JBPAPP-7211 Fix for JBossWebRealm.hasRole throwing a NullPointerException
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JBPAPP_5_1_0_Final_JBPAPP-6728:111633
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/.gitignore
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/etc/hapartition-jboss-beans.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/main/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/main/org/jboss/ha/framework/server/lock/ClusterLockState.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/main/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/cluster/src/main/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/connector/src/main/org/jboss/resource/connectionmanager/xa/XAResourceWrapperImpl.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/connector/src/main/org/jboss/resource/connectionmanager/xa/XidWrapperImpl.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/main/src/bin/run.conf.bat
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/messaging/src/main/org/jboss/jms/server/destination/QueueMODefinition.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/aop.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/classloader.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/deployers.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/jmx.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/logging.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap/vfs.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/bootstrap.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/java.policy
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/jax-ws-catalog.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/jboss-log4j.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/jboss-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/login-config.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/props
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/standardjboss.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/standardjbosscmp-jdbc.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/xmdesc
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/minimal/bootstrap.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/conf/minimal/jboss-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/deploy/legacy-invokers-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/etc/deployers/logbridge-jboss-beans.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/server/src/main/org/jboss/deployment/FileNameVirtualFileFilter.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/main/org/jboss/system/server/profileservice/repository/AbstractBootstrapProfileFactory.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/common/profiles/clustering.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/common/profiles/ejb3.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/common/profiles/jboss-web.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/config/profiles/default.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/resources/parsing-tests/config/profiles/seam.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb2
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb3
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/sar
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/servlet
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/test
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/classloader/leak/test/Ejb3ClassloaderLeakTestBase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/classloader/leak/test/IsolatedEarWithDualCommonsLoggingClassloaderLeakTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/classloader/leak/test/J2EEClassloaderLeakTestBase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/J2EEClassloaderLeakTestBase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/YieldingGloballyExclusiveClusterLockSupportUnitTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/cluster/web/notification/SessionSpecListenerAttribute.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/ejb3/common/AbstractReplierMDB.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/ejb3/common/EJB3TestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/TransactionMDB.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/unit
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/main/org/jboss/test/spring/test/SpringFacadeTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/testsuite/src/resources/bootstrapdependencies/jbas5349
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java 2011-09-16 09:46:31 UTC (rev 112248)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java 2011-09-16 12:23:56 UTC (rev 112249)
@@ -73,7 +73,6 @@
{
SecurityAssociationValve.activeWebMetaData.set(metaData);
activeCS.set(warCS);
- HttpServletRequest httpRequest = (HttpServletRequest) request.getRequest();
//Set the customized rolename-principalset mapping in jboss-app.xml
Map<String, Set<String>> principalToRoleSetMap = metaData.getPrincipalVersusRolesMap();
@@ -85,24 +84,15 @@
{
// Set the JACC context id
PolicyContext.setContextID(contextID);
- // Set the JACC HttpServletRequest PolicyContextHandler data
- 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);
}
finally
{
SecurityAssociationValve.activeWebMetaData.set(null);
- ActiveRequestResponseCacheValve.activeRequest.set(null);
- ActiveRequestResponseCacheValve.activeResponse.set(null);
SecurityAssociationActions.clear();
activeCS.set(null);
SecurityRolesAssociation.setSecurityRoles(null);
- HttpServletRequestPolicyContextHandler.setRequest(null);
}
}
@@ -111,7 +101,6 @@
{
SecurityAssociationValve.activeWebMetaData.set(metaData);
activeCS.set(warCS);
- HttpServletRequest httpRequest = (HttpServletRequest) request.getRequest();
//Set the customized rolename-principalset mapping in jboss-app.xml
Map<String, Set<String>> principalToRoleSetMap = metaData.getPrincipalVersusRolesMap();
@@ -123,25 +112,16 @@
{
// Set the JACC context id
PolicyContext.setContextID(contextID);
- // Set the JACC HttpServletRequest PolicyContextHandler data
- 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);
}
finally
{
SecurityAssociationValve.activeWebMetaData.set(null);
- ActiveRequestResponseCacheValve.activeRequest.set(null);
- ActiveRequestResponseCacheValve.activeResponse.set(null);
SecurityAssociationActions.clear();
activeCS.set(null);
SecurityRolesAssociation.setSecurityRoles(null);
- HttpServletRequestPolicyContextHandler.setRequest(null);
}
}
-}
\ No newline at end of file
+}
Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2011-09-16 09:46:31 UTC (rev 112248)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2011-09-16 12:23:56 UTC (rev 112249)
@@ -284,14 +284,6 @@
if (metaDataSecurityDomain != null)
metaDataSecurityDomain = metaDataSecurityDomain.trim();
- //Add a valve to cache the active request/response
- Engine engine = this.getCatalinaEngine(context);
- if(engine != null)
- {
- ActiveRequestResponseCacheValve activeReqValve = new ActiveRequestResponseCacheValve();
- engine.getPipeline().addValve(activeReqValve);
- }
-
// Add a valve to establish security context
SecurityContextEstablishmentValve scevalve = new SecurityContextEstablishmentValve(metaDataSecurityDomain, SecurityUtil.unprefixSecurityDomain(config
.getDefaultSecurityDomain()), SecurityActions.loadClass(config.getSecurityContextClassName()), getSecurityManagement());
Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java 2011-09-16 09:46:31 UTC (rev 112248)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java 2011-09-16 12:23:56 UTC (rev 112249)
@@ -63,6 +63,7 @@
import org.jboss.web.tomcat.metadata.ServiceMetaData;
import org.jboss.web.tomcat.metadata.ValveMetaData;
import org.jboss.web.tomcat.security.HttpServletRequestPolicyContextHandler;
+import org.jboss.web.tomcat.service.request.ActiveRequestResponseCacheValve;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
@@ -260,6 +261,7 @@
engine.setJvmRoute(StringPropertyReplacer.replaceProperties(engineMetaData.getJvmRoute()));
}
//engine.setJvmRoute(engineMetaData.getJvmRoute());
+ engine.getPipeline().addValve(new ActiveRequestResponseCacheValve());
engine.setDefaultHost(engineMetaData.getDefaultHost());
service.setContainer(engine);
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/tools/buildmagic/lib
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/varia/src/main/org/jboss/services/binding/managed/ServiceBindingMapper.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/JBPAPP_5_1_0_Final_JBPAPP-7211/varia/src/resources/seam/jboss-structure.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
More information about the jboss-cvs-commits
mailing list