[jboss-cvs] Picketbox SVN: r71 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins.

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

Author: anil.saldhana at jboss.com
Date: 2010-04-01 17:33:23 -0400 (Thu, 01 Apr 2010)
New Revision: 71

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
Log:
SECURITY-490: bring back the lock

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java	2010-03-31 21:58:34 UTC (rev 70)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java	2010-04-01 21:33:23 UTC (rev 71)
@@ -277,12 +277,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;  
@@ -469,7 +470,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();
+      }
    }
    
    /**