[jboss-cvs] Picketbox SVN: r70 - 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-03-31 17:58:34 -0400 (Wed, 31 Mar 2010)
New Revision: 70

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java
Log:
SECURITY-490: remove the additional 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-29 22:38:04 UTC (rev 69)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/JBossAuthorizationManager.java	2010-03-31 21:58:34 UTC (rev 70)
@@ -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);
       try
-      {  
-         String sc = ac.getSecurityDomain();
-         if(this.securityDomain.equals(sc) == false)
-            throw new IllegalArgumentException("The Security Domain "+ sc 
-                  + " does not match with " + this.securityDomain);
+      { 
          this.authorizationContext = ac;  
       }
       finally
@@ -466,17 +467,9 @@
          RoleGroup role)
    throws AuthorizationException
    {
-      lock.lock();
-      try
-      {
-         if(this.authorizationContext == null)
-            this.authorizationContext = new JBossAuthorizationContext(this.securityDomain);
-         return this.authorizationContext.authorize(resource, subject, role); 
-      }
-      finally
-      {
-         lock.unlock();
-      } 
+      if(this.authorizationContext == null)
+         this.setAuthorizationContext( new JBossAuthorizationContext(this.securityDomain) );
+      return this.authorizationContext.authorize(resource, subject, role); 
    }
    
    /**