[jbossweb-commits] JBossWeb SVN: r2287 - in branches: 7.4.x/src/main/java/org/apache/catalina/security and 1 other directory.

[jbossweb-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2013-10-23 04:12:47 -0400 (Wed, 23 Oct 2013)
New Revision: 2287

Modified:
   branches/7.3.x/src/main/java/org/apache/catalina/security/SecurityUtil.java
   branches/7.4.x/src/main/java/org/apache/catalina/security/SecurityUtil.java
Log:
JBWEB-282: Change cache to concurrent hash map due to concurrent startup.

Modified: branches/7.3.x/src/main/java/org/apache/catalina/security/SecurityUtil.java
===================================================================
--- branches/7.3.x/src/main/java/org/apache/catalina/security/SecurityUtil.java	2013-10-21 10:06:15 UTC (rev 2286)
+++ branches/7.3.x/src/main/java/org/apache/catalina/security/SecurityUtil.java	2013-10-23 08:12:47 UTC (rev 2287)
@@ -23,7 +23,8 @@
 import java.security.Principal;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.security.auth.Subject;
 import javax.servlet.Filter;
@@ -66,8 +67,8 @@
     /**
      * Cache every object for which we are creating method on it.
      */
-    private static HashMap<Object,Method[]> objectCache =
-        new HashMap<Object,Method[]>();
+    private static Map<Object,Method[]> objectCache =
+        new ConcurrentHashMap<Object,Method[]>();
         
     private static boolean packageDefinitionEnabled =  
          (System.getProperty("package.definition") == null && 

Modified: branches/7.4.x/src/main/java/org/apache/catalina/security/SecurityUtil.java
===================================================================
--- branches/7.4.x/src/main/java/org/apache/catalina/security/SecurityUtil.java	2013-10-21 10:06:15 UTC (rev 2286)
+++ branches/7.4.x/src/main/java/org/apache/catalina/security/SecurityUtil.java	2013-10-23 08:12:47 UTC (rev 2287)
@@ -23,7 +23,8 @@
 import java.security.Principal;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.security.auth.Subject;
 import javax.servlet.Filter;
@@ -66,8 +67,8 @@
     /**
      * Cache every object for which we are creating method on it.
      */
-    private static HashMap<Object,Method[]> objectCache =
-        new HashMap<Object,Method[]>();
+    private static Map<Object,Method[]> objectCache =
+        new ConcurrentHashMap<Object,Method[]>();
         
     private static boolean packageDefinitionEnabled =  
          (System.getProperty("package.definition") == null &&