Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 887AD106AD for ; Thu, 1 May 2014 17:50:58 +0000 (UTC) Received: (qmail 82437 invoked by uid 500); 1 May 2014 17:50:58 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 82401 invoked by uid 500); 1 May 2014 17:50:58 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 82390 invoked by uid 99); 1 May 2014 17:50:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 17:50:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 May 2014 17:50:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3244D23888E4; Thu, 1 May 2014 17:50:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1591719 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: conversation/ConversationManager.java intercept/InterceptorsManager.java proxy/InterceptorDecoratorProxyFactory.java proxy/NormalScopeProxyFactory.java Date: Thu, 01 May 2014 17:50:33 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140501175033.3244D23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Thu May 1 17:50:32 2014 New Revision: 1591719 URL: http://svn.apache.org/r1591719 Log: OWB-952 using ConcurrentMap where possible Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1591719&r1=1591718&r2=1591719&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java Thu May 1 17:50:32 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 conversations = new ConcurrentHashMap(); + private final ConcurrentMap conversations = new ConcurrentHashMap(); private final WebBeansContext webBeansContext; private final static Logger logger = WebBeansLoggerFacade.getLogger(ConversationManager.class); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1591719&r1=1591718&r2=1591719&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java Thu May 1 17:50:32 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, Interceptor> ejbInterceptors = new ConcurrentHashMap, Interceptor>(); + private ConcurrentMap, Interceptor> ejbInterceptors = new ConcurrentHashMap, Interceptor>(); /**Additional interceptor class*/ private List> additionalInterceptorClasses = new ArrayList>(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java?rev=1591719&r1=1591718&r2=1591719&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/InterceptorDecoratorProxyFactory.java Thu May 1 17:50:32 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, Class> cachedProxyClasses = new ConcurrentHashMap, Class>(); + private ConcurrentMap, Class> cachedProxyClasses = new ConcurrentHashMap, Class>(); public InterceptorDecoratorProxyFactory(WebBeansContext webBeansContext) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java?rev=1591719&r1=1591718&r2=1591719&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/NormalScopeProxyFactory.java Thu May 1 17:50:32 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, Class> cachedProxyClasses = new ConcurrentHashMap, Class>(); + private ConcurrentMap, Class> cachedProxyClasses = new ConcurrentHashMap, Class>(); public NormalScopeProxyFactory(WebBeansContext webBeansContext)