You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/04/26 23:02:04 UTC
svn commit: r1331086 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/configuration/spring/
api/src/main/java/org/apache/cxf/endpoint/
api/src/main/java/org/apache/cxf/extension/
api/src/main/java/org/apache/cxf/service/model/ rt/core/src/main/java/or...
Author: dkulp
Date: Thu Apr 26 21:02:02 2012
New Revision: 1331086
URL: http://svn.apache.org/viewvc?rev=1331086&view=rev
Log:
Almost all of our use of ConcurrentHashMap is 99% readonly with very
occassional writes. Thus, the default concurrency level of 16 just
results in many more objects created and more memory used. Reduce the
concurrency level in most places.
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
cxf/trunk/api/src/main/java/org/apache/cxf/extension/RegistryImpl.java
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/OperationInfo.java
cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractSpringBeanMap.java Thu Apr 26 21:02:02 2012
@@ -48,7 +48,7 @@ abstract class AbstractSpringBeanMap<X,
protected String idsProperty;
protected String staticFieldName;
protected Map<X, List<String>> idToBeanName = new ConcurrentHashMap<X, List<String>>();
- protected Map<X, V> putStore = new ConcurrentHashMap<X, V>();
+ protected Map<X, V> putStore = new ConcurrentHashMap<X, V>(4, 0.75f, 4);
public void setApplicationContext(ApplicationContext ctx) throws BeansException {
this.context = ctx;
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/endpoint/ClientImpl.java Thu Apr 26 21:02:02 2012
@@ -94,7 +94,7 @@ public class ClientImpl
protected PhaseChainCache outboundChainCache = new PhaseChainCache();
protected PhaseChainCache inboundChainCache = new PhaseChainCache();
- protected Map<String, Object> currentRequestContext = new ConcurrentHashMap<String, Object>();
+ protected Map<String, Object> currentRequestContext = new ConcurrentHashMap<String, Object>(8, 0.75f, 4);
protected Map<Thread, EchoContext> requestContext
= Collections.synchronizedMap(new WeakHashMap<Thread, EchoContext>());
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/extension/RegistryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/extension/RegistryImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/extension/RegistryImpl.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/extension/RegistryImpl.java Thu Apr 26 21:02:02 2012
@@ -35,7 +35,7 @@ public class RegistryImpl<K, T> implemen
protected RegistryImpl(Map<K, T> e) {
if (null == e) {
- e = new ConcurrentHashMap<K, T>();
+ e = new ConcurrentHashMap<K, T>(16, 0.75f, 4);
} else if (!(e instanceof ConcurrentHashMap)) {
e = new ConcurrentHashMap<K, T>(e);
}
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java Thu Apr 26 21:02:02 2012
@@ -124,7 +124,7 @@ public abstract class AbstractProperties
return;
}
if (null == propertyMap.get()) {
- propertyMap.compareAndSet(null, new ConcurrentHashMap<String, Object>(4));
+ propertyMap.compareAndSet(null, new ConcurrentHashMap<String, Object>(4, 0.75f, 2));
}
if (v == null) {
propertyMap.get().remove(name);
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingInfo.java Thu Apr 26 21:02:02 2012
@@ -38,7 +38,8 @@ public class BindingInfo extends Abstrac
ServiceInfo service;
final String bindingId;
- Map<QName, BindingOperationInfo> operations = new ConcurrentHashMap<QName, BindingOperationInfo>(4);
+ Map<QName, BindingOperationInfo> operations
+ = new ConcurrentHashMap<QName, BindingOperationInfo>(4, 0.75f, 2);
public BindingInfo(ServiceInfo service, String bindingId) {
this.service = service;
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java Thu Apr 26 21:02:02 2012
@@ -62,7 +62,7 @@ public class BindingOperationInfo extend
Collection<FaultInfo> of = opinfo.getFaults();
if (of != null && !of.isEmpty()) {
- faults = new ConcurrentHashMap<QName, BindingFaultInfo>(of.size());
+ faults = new ConcurrentHashMap<QName, BindingFaultInfo>(of.size(), 0.75f, 2);
for (FaultInfo fault : of) {
faults.put(fault.getFaultName(), new BindingFaultInfo(fault, this));
}
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java Thu Apr 26 21:02:02 2012
@@ -36,7 +36,7 @@ public class InterfaceInfo extends Abstr
QName name;
ServiceInfo service;
- Map<QName, OperationInfo> operations = new ConcurrentHashMap<QName, OperationInfo>(4);
+ Map<QName, OperationInfo> operations = new ConcurrentHashMap<QName, OperationInfo>(4, 0.75f, 2);
public InterfaceInfo(ServiceInfo info, QName q) {
name = q;
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/service/model/OperationInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/OperationInfo.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/OperationInfo.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/OperationInfo.java Thu Apr 26 21:02:02 2012
@@ -159,7 +159,7 @@ public class OperationInfo extends Abstr
*/
public synchronized void addFault(FaultInfo fault) {
if (faults == null) {
- faults = new ConcurrentHashMap<QName, FaultInfo>(4);
+ faults = new ConcurrentHashMap<QName, FaultInfo>(4, 0.75f, 2);
}
faults.put(fault.getFaultName(), fault);
}
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/service/model/ServiceInfo.java Thu Apr 26 21:02:02 2012
@@ -137,7 +137,7 @@ public class ServiceInfo extends Abstrac
}
private void initMessagesMap() {
- messages = new ConcurrentHashMap<QName, MessageInfo>();
+ messages = new ConcurrentHashMap<QName, MessageInfo>(16, 0.75f, 2);
for (OperationInfo operation : getInterface().getOperations()) {
if (operation.getInput() != null) {
messages.put(operation.getInput().getName(), operation.getInput());
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/CXFBusImpl.java Thu Apr 26 21:02:02 2012
@@ -57,7 +57,7 @@ public class CXFBusImpl extends Abstract
protected String id;
private BusState state;
private final Collection<AbstractFeature> features = new CopyOnWriteArrayList<AbstractFeature>();
- private final Map<String, Object> properties = new ConcurrentHashMap<String, Object>();
+ private final Map<String, Object> properties = new ConcurrentHashMap<String, Object>(16, 0.75f, 4);
public CXFBusImpl() {
this(null);
@@ -65,7 +65,7 @@ public class CXFBusImpl extends Abstract
public CXFBusImpl(Map<Class<?>, Object> extensions) {
if (extensions == null) {
- extensions = new ConcurrentHashMap<Class<?>, Object>();
+ extensions = new ConcurrentHashMap<Class<?>, Object>(16, 0.75f, 4);
} else {
extensions = new ConcurrentHashMap<Class<?>, Object>(extensions);
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java Thu Apr 26 21:02:02 2012
@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentMa
*/
public final class ExtensionRegistry {
private static ConcurrentMap<String, Extension> extensions
- = new ConcurrentHashMap<String, Extension>();
+ = new ConcurrentHashMap<String, Extension>(16, 0.75f, 4);
private ExtensionRegistry() {
//singleton
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java Thu Apr 26 21:02:02 2012
@@ -53,10 +53,10 @@ public final class BindingFactoryManager
Bus bus;
public BindingFactoryManagerImpl() {
- bindingFactories = new ConcurrentHashMap<String, BindingFactory>();
+ bindingFactories = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
}
public BindingFactoryManagerImpl(Bus b) {
- bindingFactories = new ConcurrentHashMap<String, BindingFactory>();
+ bindingFactories = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
setBus(b);
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java Thu Apr 26 21:02:02 2012
@@ -51,10 +51,10 @@ public final class ConduitInitiatorManag
private Bus bus;
public ConduitInitiatorManagerImpl() {
- conduitInitiators = new ConcurrentHashMap<String, ConduitInitiator>();
+ conduitInitiators = new ConcurrentHashMap<String, ConduitInitiator>(8, 0.75f, 4);
}
public ConduitInitiatorManagerImpl(Bus b) {
- conduitInitiators = new ConcurrentHashMap<String, ConduitInitiator>();
+ conduitInitiators = new ConcurrentHashMap<String, ConduitInitiator>(8, 0.75f, 4);
setBus(b);
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java Thu Apr 26 21:02:02 2012
@@ -52,10 +52,10 @@ public final class DestinationFactoryMan
private Bus bus;
public DestinationFactoryManagerImpl() {
- destinationFactories = new ConcurrentHashMap<String, DestinationFactory>();
+ destinationFactories = new ConcurrentHashMap<String, DestinationFactory>(8, 0.75f, 4);
}
public DestinationFactoryManagerImpl(Bus b) {
- destinationFactories = new ConcurrentHashMap<String, DestinationFactory>();
+ destinationFactories = new ConcurrentHashMap<String, DestinationFactory>(8, 0.75f, 4);
setBus(b);
}
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java Thu Apr 26 21:02:02 2012
@@ -30,7 +30,7 @@ import org.apache.cxf.headers.HeaderProc
@NoJSR250Annotations(unlessNull = "bus")
public class HeaderManagerImpl implements HeaderManager {
- Map<String, HeaderProcessor> processors = new ConcurrentHashMap<String, HeaderProcessor>();
+ Map<String, HeaderProcessor> processors = new ConcurrentHashMap<String, HeaderProcessor>(4, 0.75f, 2);
Bus bus;
public HeaderManagerImpl() {
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java Thu Apr 26 21:02:02 2012
@@ -46,7 +46,7 @@ public class WorkQueueManagerImpl implem
LogUtils.getL7dLogger(WorkQueueManagerImpl.class);
Map<String, AutomaticWorkQueue> namedQueues
- = new ConcurrentHashMap<String, AutomaticWorkQueue>();
+ = new ConcurrentHashMap<String, AutomaticWorkQueue>(4, 0.75f, 2);
boolean inShutdown;
InstrumentationManager imanager;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java Thu Apr 26 21:02:02 2012
@@ -40,7 +40,8 @@ import org.osgi.framework.SynchronousBun
public class CXFExtensionBundleListener implements SynchronousBundleListener {
private static final Logger LOG = LogUtils.getL7dLogger(CXFActivator.class);
private long id;
- private ConcurrentMap<Long, List<Extension>> extensions = new ConcurrentHashMap<Long, List<Extension>>();
+ private ConcurrentMap<Long, List<Extension>> extensions
+ = new ConcurrentHashMap<Long, List<Extension>>(16, 0.75f, 4);
public CXFExtensionBundleListener(long bundleId) {
this.id = bundleId;
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java Thu Apr 26 21:02:02 2012
@@ -44,7 +44,7 @@ public class ManagedWorkQueueList implem
private static final Logger LOG = LogUtils.getL7dLogger(ManagedWorkQueueList.class);
private Map<String, AutomaticWorkQueueImpl> queues =
- new ConcurrentHashMap<String, AutomaticWorkQueueImpl>();
+ new ConcurrentHashMap<String, AutomaticWorkQueueImpl>(4, 0.75f, 2);
private ServiceTracker configAdminTracker;
public String getName() {
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Thu Apr 26 21:02:02 2012
@@ -1410,7 +1410,7 @@ public class ReflectionServiceFactoryBea
}
private Map<Class<?>, Boolean> getJaxbAnnoMap(MessagePartInfo mpi) {
- Map<Class<?>, Boolean> map = new ConcurrentHashMap<Class<?>, Boolean>();
+ Map<Class<?>, Boolean> map = new ConcurrentHashMap<Class<?>, Boolean>(4, 0.75f, 1);
Annotation[] anns = getMethodParameterAnnotations(mpi);
if (anns != null) {
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java Thu Apr 26 21:02:02 2012
@@ -31,11 +31,11 @@ public class SimpleMethodDispatcher
implements org.apache.cxf.service.invoker.MethodDispatcher {
private Map<Method, Map<BindingInfo, BindingOperationInfo>> infoMap =
- new ConcurrentHashMap<Method, Map<BindingInfo, BindingOperationInfo>>();
+ new ConcurrentHashMap<Method, Map<BindingInfo, BindingOperationInfo>>(16, 0.75f, 2);
private Map<OperationInfo, Method> opToMethod =
- new ConcurrentHashMap<OperationInfo, Method>();
+ new ConcurrentHashMap<OperationInfo, Method>(16, 0.75f, 2);
private Map<Method, OperationInfo> methodToOp =
- new ConcurrentHashMap<Method, OperationInfo>();
+ new ConcurrentHashMap<Method, OperationInfo>(16, 0.75f, 2);
public SimpleMethodDispatcher() {
//complete
@@ -47,7 +47,7 @@ public class SimpleMethodDispatcher
methodToOp.put(m, o);
Map<BindingInfo, BindingOperationInfo> biToBop
- = new ConcurrentHashMap<BindingInfo, BindingOperationInfo>();
+ = new ConcurrentHashMap<BindingInfo, BindingOperationInfo>(4, 0.75f, 2);
infoMap.put(m, biToBop);
}
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java Thu Apr 26 21:02:02 2012
@@ -70,7 +70,8 @@ import org.apache.cxf.staxutils.StaxUtil
public class SwAOutInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(SwAOutInterceptor.class);
- private static final Map<String, Method> SWA_REF_METHOD = new ConcurrentHashMap<String, Method>();
+ private static final Map<String, Method> SWA_REF_METHOD
+ = new ConcurrentHashMap<String, Method>(4, 0.75f, 2);
AttachmentOutInterceptor attachOut = new AttachmentOutInterceptor();
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java Thu Apr 26 21:02:02 2012
@@ -162,13 +162,13 @@ public class WSDLGetUtils {
if (mp == null) {
endpointInfo.getService().setProperty(WSDLS_KEY,
- new ConcurrentHashMap<String, Definition>());
+ new ConcurrentHashMap<String, Definition>(8, 0.75f, 4));
mp = CastUtils.cast((Map<?, ?>)endpointInfo.getService()
.getProperty(WSDLS_KEY));
}
if (smp == null) {
endpointInfo.getService().setProperty(SCHEMAS_KEY,
- new ConcurrentHashMap<String, SchemaReference>());
+ new ConcurrentHashMap<String, SchemaReference>(8, 0.75f, 4));
smp = CastUtils.cast((Map<?, ?>)endpointInfo.getService()
.getProperty(SCHEMAS_KEY));
}
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Cookies.java Thu Apr 26 21:02:02 2012
@@ -30,7 +30,7 @@ public class Cookies {
/**
* Variables for holding session state if sessions are supposed to be maintained
*/
- private final Map<String, Cookie> sessionCookies = new ConcurrentHashMap<String, Cookie>();
+ private final Map<String, Cookie> sessionCookies = new ConcurrentHashMap<String, Cookie>(4, 0.75f, 4);
private boolean maintainSession;
public Map<String, Cookie> getSessionCookies() {
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java Thu Apr 26 21:02:02 2012
@@ -125,7 +125,7 @@ public class HTTPTransportActivator
ServiceRegistration reg;
ServiceRegistration reg2;
Map<String, PidInfo> props
- = new ConcurrentHashMap<String, PidInfo>();
+ = new ConcurrentHashMap<String, PidInfo>(4, 0.75f, 2);
CopyOnWriteArrayList<PidInfo> sorted = new CopyOnWriteArrayList<PidInfo>();
public void start(BundleContext context) throws Exception {
Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java (original)
+++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyRegistryImpl.java Thu Apr 26 21:02:02 2012
@@ -30,7 +30,7 @@ import org.apache.neethi.PolicyRegistry;
*/
public class PolicyRegistryImpl implements PolicyRegistry {
- private Map<String, Policy> reg = new ConcurrentHashMap<String, Policy>();
+ private Map<String, Policy> reg = new ConcurrentHashMap<String, Policy>(16, 0.75f, 4);
public Policy lookup(String key) {
return reg.get(key);
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1331086&r1=1331085&r2=1331086&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Thu Apr 26 21:02:02 2012
@@ -117,7 +117,7 @@ public class PolicyBasedWSS4JInIntercept
Map<Object, Properties> o =
CastUtils.cast((Map<?, ?>)message.getContextualProperty(PROPERTIES_CACHE));
if (o == null) {
- o = new ConcurrentHashMap<Object, Properties>();
+ o = new ConcurrentHashMap<Object, Properties>(16, 0.75f, 2);
info.setProperty(PROPERTIES_CACHE, o);
}
return o;