[jboss-cvs] JBossAS SVN: r104069 - projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss.

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

Author: remy.maucherat at jboss.com
Date: 2010-04-16 21:02:13 -0400 (Fri, 16 Apr 2010)
New Revision: 104069

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
Log:
- Quick fix for bad sync on runAsIdentity.

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2010-04-16 20:24:09 UTC (rev 104068)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2010-04-17 01:02:13 UTC (rev 104069)
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
@@ -129,7 +130,7 @@
    /** A list of extra dependencies to wait on */
    private List<String> depends;
    /** */
-   private Map<String, RunAsIdentityMetaData> runAsIdentity = new HashMap<String, RunAsIdentityMetaData>();
+   private Map<String, RunAsIdentityMetaData> runAsIdentity = new ConcurrentHashMap<String, RunAsIdentityMetaData>();
    private SecurityRolesMetaData securityRoles = new SecurityRolesMetaData();
    /** The servlets */
    private JBossServletsMetaData servlets = new JBossServletsMetaData();
@@ -861,15 +862,12 @@
             if (servlet != null)
             {
                // Check for a web.xml run-as only specification
-               synchronized (runAsIdentity)
+               RunAsMetaData runAs = servlet.getRunAs();
+               if (runAs != null)
                {
-                  RunAsMetaData runAs = servlet.getRunAs();
-                  if (runAs != null)
-                  {
-                     String roleName = runAs.getRoleName();
-                     identity = new RunAsIdentityMetaData(roleName, null);
-                     runAsIdentity.put(servletName, identity);
-                  }
+                  String roleName = runAs.getRoleName();
+                  identity = new RunAsIdentityMetaData(roleName, null);
+                  runAsIdentity.put(servletName, identity);
                }
             }
          }