[jboss-cvs] JBossAS SVN: r103465 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 1 17:40:24 EDT 2010
Author: anil.saldhana at jboss.com
Date: 2010-04-01 17:40:24 -0400 (Thu, 01 Apr 2010)
New Revision: 103465
Modified:
projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
Log:
SECURITY-490: bring back the lock
Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java 2010-04-01 20:09:55 UTC (rev 103464)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java 2010-04-01 21:40:24 UTC (rev 103465)
@@ -278,12 +278,13 @@
{
if(ac == null)
throw new IllegalArgumentException("AuthorizationContext is null");
- lock.lock();
String sc = ac.getSecurityDomain();
if(this.securityDomain.equals(sc) == false)
throw new IllegalArgumentException("The Security Domain "+ sc
+ " does not match with " + this.securityDomain);
+
+ lock.lock();
try
{
this.authorizationContext = ac;
@@ -470,7 +471,15 @@
{
if(this.authorizationContext == null)
this.setAuthorizationContext( new JBossAuthorizationContext(this.securityDomain) );
- return this.authorizationContext.authorize(resource, subject, role);
+ lock.lock();
+ try
+ {
+ return this.authorizationContext.authorize(resource, subject, role);
+ }
+ finally
+ {
+ lock.unlock();
+ }
}
/**
More information about the jboss-cvs-commits
mailing list