Author: rmannibucau
Date: Thu May 1 17:47:33 2014
New Revision: 1591718
URL: http://svn.apache.org/r1591718
Log:
OWB-952 using ConcurrentMap instead of ConcurrentHashMap where possible
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1591718&r1=1591717&r2=1591718&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
(original)
+++
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
Thu May 1 17:47:33 2014
@@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -47,7 +48,7 @@ import org.apache.webbeans.util.Asserts;
public class ConversationManager
{
/**Current conversations*/
- private final ConcurrentHashMap<Conversation, ConversationContext>
conversations = new ConcurrentHashMap<Conversation, ConversationContext>();
+ private final ConcurrentMap<Conversation, ConversationContext>
conversations = new ConcurrentHashMap<Conversation, ConversationContext>();
private final WebBeansContext webBeansContext;
private final static Logger logger =
WebBeansLoggerFacade.getLogger(ConversationManager.class);
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1591718&r1=1591717&r2=1591718&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
(original)
+++
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
Thu May 1 17:47:33 2014
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.enterprise.inject.spi.AnnotatedType;
@@ -66,7 +67,7 @@ public class InterceptorsManager
/**
* EJB-style Interceptor beans.
*/
- private ConcurrentHashMap<Class<?>, Interceptor<?>> ejbInterceptors = new
ConcurrentHashMap<Class<?>, Interceptor<?>>();
+ private ConcurrentMap<Class<?>, Interceptor<?>> ejbInterceptors = new
ConcurrentHashMap<Class<?>, Interceptor<?>>();
/**Additional interceptor class*/
private List<Class<?>> additionalInterceptorClasses = new
ArrayList<Class<?>>();
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java?rev=1591718&r1=1591717&r2=1591718&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
(original)
+++
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java
Thu May 1 17:47:33 2014
@@ -36,6 +36,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.logging.Logger;
@@ -66,7 +67,7 @@ public class InterceptorDecoratorProxyFa
* Caches the proxy classes for each bean.
* We need this to prevent filling up the ClassLoaders by
*/
- private ConcurrentHashMap<Bean<?>, Class<?>> cachedProxyClasses = new
ConcurrentHashMap<Bean<?>, Class<?>>();
+ private ConcurrentMap<Bean<?>, Class<?>> cachedProxyClasses = new
ConcurrentHashMap<Bean<?>, Class<?>>();
public InterceptorDecoratorProxyFactory(WebBeansContext webBeansContext)
Modified:
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
URL:
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java?rev=1591718&r1=1591717&r2=1591718&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
(original)
+++
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java
Thu May 1 17:47:33 2014
@@ -30,6 +30,7 @@ import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import org.apache.webbeans.component.OwbBean;
import org.apache.webbeans.config.OpenWebBeansConfiguration;
@@ -61,7 +62,7 @@ public class NormalScopeProxyFactory ext
* Caches the proxy classes for each bean.
* We need this to prevent filling up the ClassLoaders by
*/
- private ConcurrentHashMap<Bean<?>, Class<?>> cachedProxyClasses = new
ConcurrentHashMap<Bean<?>, Class<?>>();
+ private ConcurrentMap<Bean<?>, Class<?>> cachedProxyClasses = new
ConcurrentHashMap<Bean<?>, Class<?>>();
public NormalScopeProxyFactory(WebBeansContext webBeansContext)
