[jboss-cvs] JBossAS SVN: r103588 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/authorization.

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

Author: anil.saldhana at jboss.com
Date: 2010-04-06 14:21:58 -0400 (Tue, 06 Apr 2010)
New Revision: 103588

Modified:
   projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
Log:
SECURITY-490: sync on the ctx

Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
===================================================================
--- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java	2010-04-06 17:43:28 UTC (rev 103587)
+++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java	2010-04-06 18:21:58 UTC (rev 103588)
@@ -144,30 +144,27 @@
             //Increase the counter of authorizations in use
             JBossAuthorizationContextManagement.increase();
             this.authenticatedSubject = subject;
-            initializeModules(resource, callerRoles);
-         }
-         catch (PrivilegedActionException e1)
-         {
-            throw new RuntimeException(e1);
-         }
-         //Do a PrivilegedAction
-         try
-         {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+            
+            synchronized(this)
             {
-               public Object run() throws AuthorizationException
+               initializeModules(resource, callerRoles); 
+
+               AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
                {
-                  int result = invokeAuthorize(resource);
-                  if (result == PERMIT)
-                     invokeCommit();
-                  if (result == DENY)
+                  public Object run() throws AuthorizationException
                   {
-                     invokeAbort();
-                     throw new AuthorizationException("Denied");
+                     int result = invokeAuthorize(resource);
+                     if (result == PERMIT)
+                        invokeCommit();
+                     if (result == DENY)
+                     {
+                        invokeAbort();
+                        throw new AuthorizationException("Denied");
+                     }
+                     return null;
                   }
-                  return null;
-               }
-            });
+               });
+            }
          }
          catch (PrivilegedActionException e)
          {
@@ -419,6 +416,6 @@
             modules.clear();
             controlFlags.clear(); 
          }
-      }
+      } 
    }
 }
\ No newline at end of file