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

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

Author: mmoyses
Date: 2010-08-04 14:24:01 -0400 (Wed, 04 Aug 2010)
New Revision: 107392

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
Log:
JBPAPP-4786: removing synchronization block and relying on ConcurrentHashMap instead

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2010-08-04 16:41:36 UTC (rev 107391)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2010-08-04 18:24:01 UTC (rev 107392)
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
@@ -121,7 +122,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();
@@ -852,15 +853,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);
                }
             }
          }