Index: jbossas4-4.2.3.GA/jmx/src/main/javax/management/monitor/Monitor.java
===================================================================
--- jbossas4-4.2.3.GA.orig/jmx/src/main/javax/management/monitor/Monitor.java 2008-07-18 17:06:30.000000000 +0200
+++ jbossas4-4.2.3.GA/jmx/src/main/javax/management/monitor/Monitor.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.mx.util.ObservedObject;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* The monitor service.
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2008-07-18 17:08:01.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/oil2/OIL2SocketHandler.java 2008-11-10 20:14:55.000000000 +0100
@@ -29,7 +29,7 @@
import org.jboss.logging.Logger;
import EDU.oswego.cs.dl.util.concurrent.Channel;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
import EDU.oswego.cs.dl.util.concurrent.Slot;
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2008-07-18 17:08:02.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/uil2/SocketManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.util.stream.NotifyingBufferedInputStream;
import org.jboss.util.stream.NotifyingBufferedOutputStream;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
import EDU.oswego.cs.dl.util.concurrent.PooledExecutor;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/pm/TxManager.java 2008-07-18 17:08:00.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/pm/TxManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,8 +33,8 @@
import org.jboss.mq.Recoverable;
import org.jboss.mq.SpyJMSException;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
/**
* This class allows provides the base for user supplied persistence packages.
@@ -493,4 +493,4 @@
return txids.isEmpty();
}
}
-}
\ No newline at end of file
+}
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2008-07-18 17:07:59.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/pm/none/PersistenceManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.mq.server.MessageReference;
import org.jboss.system.ServiceMBeanSupport;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
/**
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2008-07-18 17:07:59.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/BasicQueue.java 2008-11-10 20:14:55.000000000 +0100
@@ -50,8 +50,8 @@
import org.jboss.util.timeout.Timeout;
import org.jboss.util.timeout.TimeoutTarget;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
/**
* This class represents a queue which provides it's messages exclusively to one
Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java
===================================================================
--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2008-07-18 17:07:36.000000000 +0200
+++ jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/pooled/interfaces/OptimizedObjectInputStream.java 2008-11-10 20:14:55.000000000 +0100
@@ -32,8 +32,8 @@
import java.util.Map;
import java.util.WeakHashMap;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* An ObjectInputStream subclass used by the MarshalledValue class to
@@ -49,7 +49,7 @@
{
/** A class wide cache of proxy classes populated by resolveProxyClass */
private static Map classCache;
- private static ConcurrentReaderHashMap objectStreamClassCache;
+ private static ConcurrentHashMap objectStreamClassCache;
private static Method lookupStreamClass = null;
static
@@ -76,7 +76,7 @@
if (flag == true)
{
classCache = Collections.synchronizedMap(new WeakHashMap());
- objectStreamClassCache = new ConcurrentReaderHashMap();
+ objectStreamClassCache = new ConcurrentHashMap();
}
else
{
Index: jbossas4-4.2.3.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java
===================================================================
--- jbossas4-4.2.3.GA.orig/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2008-07-18 17:02:55.000000000 +0200
+++ jbossas4-4.2.3.GA/tomcat/src/main/org/jboss/web/tomcat/service/sso/ClusteredSingleSignOn.java 2008-11-10 20:14:55.000000000 +0100
@@ -44,7 +44,7 @@
import org.jboss.web.tomcat.service.JBossWeb;
import org.jboss.web.tomcat.service.session.JBossManager;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
Index: jbossas4-4.2.3.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java
===================================================================
--- jbossas4-4.2.3.GA.orig/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2008-07-18 17:02:52.000000000 +0200
+++ jbossas4-4.2.3.GA/transaction/src/main/org/jboss/tm/TransactionLocalDelegateImpl.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.util.NestedRuntimeException;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
/**
Index: jbossas4-4.2.3.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
===================================================================
--- jbossas4-4.2.3.GA.orig/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2008-07-18 17:06:53.000000000 +0200
+++ jbossas4-4.2.3.GA/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2008-11-10 20:14:55.000000000 +0100
@@ -30,7 +30,7 @@
import org.jboss.mx.loading.LoaderRepository;
import org.jboss.mx.loading.RepositoryClassLoader;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A domain that is used for scoped classloaders
@@ -43,8 +43,8 @@
WeakReference loader;
boolean parentDelegation;
- ConcurrentReaderHashMap myPerVMAspects = new ConcurrentReaderHashMap();
- ConcurrentReaderHashMap notMyPerVMAspects = new ConcurrentReaderHashMap();
+ ConcurrentHashMap myPerVMAspects = new ConcurrentHashMap();
+ ConcurrentHashMap notMyPerVMAspects = new ConcurrentHashMap();
public ScopedClassLoaderDomain(ClassLoader loader, String name, boolean parentDelegation, AspectManager manager, boolean parentFirst)
{
Index: jbossas4-4.2.3.GA/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
===================================================================
--- jbossas4-4.2.3.GA.orig/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2008-07-18 16:59:51.000000000 +0200
+++ jbossas4-4.2.3.GA/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java 2008-11-10 20:14:55.000000000 +0100
@@ -37,7 +37,7 @@
import javax.management.ObjectName;
import EDU.oswego.cs.dl.util.concurrent.Latch;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import org.jboss.logging.Logger;
@@ -68,9 +68,9 @@
// Attributes ----------------------------------------------------
protected static int threadID;
- protected ConcurrentReaderHashMap localReplicants = new ConcurrentReaderHashMap();
- protected ConcurrentReaderHashMap replicants = new ConcurrentReaderHashMap();
- protected ConcurrentReaderHashMap keyListeners = new ConcurrentReaderHashMap();
+ protected ConcurrentHashMap localReplicants = new ConcurrentHashMap();
+ protected ConcurrentHashMap replicants = new ConcurrentHashMap();
+ protected ConcurrentHashMap keyListeners = new ConcurrentHashMap();
protected HashMap intraviewIdCache = new HashMap();
protected HAPartition partition;
/** The handler used to send replicant change notifications asynchronously */
Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java
===================================================================
--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2008-07-18 17:06:09.000000000 +0200
+++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java 2008-11-10 20:14:55.000000000 +0100
@@ -37,7 +37,7 @@
import org.jboss.resource.adapter.jms.inflow.JmsActivation;
import org.jboss.resource.adapter.jms.inflow.JmsActivationSpec;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A generic resource adapter for any JMS server.
@@ -54,7 +54,7 @@
private BootstrapContext ctx;
/** The activations by activation spec */
- private ConcurrentReaderHashMap activations = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap activations = new ConcurrentHashMap();
/**
* Get the work manager
Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java
===================================================================
--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2008-07-18 17:06:08.000000000 +0200
+++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/adapter/mail/MailResourceAdapter.java 2008-11-10 20:14:55.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.resource.adapter.mail.inflow.MailActivationSpec;
import org.jboss.resource.adapter.mail.inflow.NewMsgsWorker;
import org.jboss.logging.Logger;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @author Scott.Stark@jboss.org
@@ -48,7 +48,7 @@
private BootstrapContext ctx;
/** The activations by activation spec */
- private ConcurrentReaderHashMap activations = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap activations = new ConcurrentHashMap();
/** */
private NewMsgsWorker newMsgsWorker;
Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
===================================================================
--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2008-07-18 17:06:11.000000000 +0200
+++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2008-11-10 20:14:55.000000000 +0100
@@ -55,7 +55,7 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.tm.TransactionLocal;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* The JBossManagedConnectionPool mbean configures and supplies pooling of
@@ -484,7 +484,7 @@
public abstract static class BasePool implements ManagedConnectionPool, StatisticsReporter, PreFillPoolSupport
{
/** The subpools */
- private final Map subPools = new ConcurrentReaderHashMap();
+ private final Map subPools = new ConcurrentHashMap();
/** The managed connection factory */
private final ManagedConnectionFactory mcf;
Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java
===================================================================
--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2008-07-18 17:06:10.000000000 +0200
+++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/metadata/ConnectorMetaData.java 2008-11-10 20:14:55.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.Iterator;
import java.util.Locale;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Connector meta data
@@ -59,7 +59,7 @@
private LicenseMetaData lmd = new LicenseMetaData();
/** The descriptions */
- private ConcurrentReaderHashMap descriptions = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap descriptions = new ConcurrentHashMap();
/** The connection definitions */
private HashSet connectionDefinitions = new HashSet();
Index: jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java
===================================================================
--- jbossas4-4.2.3.GA.orig/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2008-07-18 17:06:10.000000000 +0200
+++ jbossas4-4.2.3.GA/connector/src/main/org/jboss/resource/metadata/DescriptionMetaDataContainer.java 2008-11-10 20:14:55.000000000 +0100
@@ -26,7 +26,7 @@
import java.util.Iterator;
import java.util.Locale;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* An abstract class for meta data that has descriptions
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 2831943526217092377L;
/** The descriptions */
- private ConcurrentReaderHashMap descriptions = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap descriptions = new ConcurrentHashMap();
public DescriptionMetaDataContainer()
{
Index: jbossas4-4.2.3.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java
===================================================================
--- jbossas4-4.2.3.GA.orig/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2008-07-18 17:00:56.000000000 +0200
+++ jbossas4-4.2.3.GA/ejb3/src/main/org/jboss/ejb3/statistics/InvocationStatistics.java 2008-11-10 20:14:55.000000000 +0100
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.Map;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/** A method invocation statistics collection class.
*
@@ -65,7 +65,7 @@
public InvocationStatistics()
{
- methodStats = new ConcurrentReaderHashMap();
+ methodStats = new ConcurrentHashMap();
}
/** Update the TimeStatistic for the given method. This synchronizes on
Index: jbossas4-4.2.3.GA/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java
===================================================================
--- jbossas4-4.2.3.GA.orig/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2008-07-18 17:00:05.000000000 +0200
+++ jbossas4-4.2.3.GA/ejb3/src/test/org/jboss/ejb3/test/jca/inflow/TestResourceAdapter.java 2008-11-10 20:14:55.000000000 +0100
@@ -38,7 +38,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A TestResourceAdapter.
@@ -52,7 +52,7 @@
BootstrapContext ctx;
- ConcurrentReaderHashMap endpoints = new ConcurrentReaderHashMap();
+ ConcurrentHashMap endpoints = new ConcurrentHashMap();
public TestResourceAdapterInflowResults testInflow() throws Exception
{
Index: jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java
===================================================================
--- jbossas4-4.2.3.GA.orig/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2008-07-18 17:06:26.000000000 +0200
+++ jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/LoaderRepository.java 2008-11-10 20:14:55.000000000 +0100
@@ -21,7 +21,7 @@
*/
package org.jboss.mx.loading;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import org.jboss.logging.Logger;
import org.jboss.mx.server.ServerConstants;
import org.jboss.util.loading.Translator;
@@ -52,7 +52,7 @@
/** The loaded classes cache, HashMap<String, Class>.
* Access synchronized via this.classes monitor.
*/
- private ConcurrentReaderHashMap classes = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap classes = new ConcurrentHashMap();
/**
Index: jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java
===================================================================
--- jbossas4-4.2.3.GA.orig/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2008-07-18 17:06:26.000000000 +0200
+++ jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/RepositoryClassLoader.java 2008-11-10 20:14:55.000000000 +0100
@@ -46,7 +46,7 @@
import org.jboss.util.collection.SoftSet;
import EDU.oswego.cs.dl.util.concurrent.ReentrantLock;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A RepositoryClassLoader.
@@ -82,7 +82,7 @@
/** Names of resources that were not found in loadResourceLocally */
private Set resourceBlackList = Collections.synchronizedSet(new HashSet());
/** A HashMap<String, URL> for resource found in loadResourceLocally */
- private ConcurrentReaderHashMap resourceCache = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap resourceCache = new ConcurrentHashMap();
/** Lock */
protected ReentrantLock loadLock = new ReentrantLock();
Index: jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java
===================================================================
--- jbossas4-4.2.3.GA.orig/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2008-07-18 17:06:26.000000000 +0200
+++ jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/loading/UnifiedLoaderRepository3.java 2008-11-10 20:14:55.000000000 +0100
@@ -49,8 +49,8 @@
import org.jboss.logging.Logger;
import org.jboss.mx.util.JBossNotificationBroadcasterSupport;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
/** A repository of class loaders that form a flat namespace of classes
* and resources. This version uses UnifiedClassLoader3 instances. Class
@@ -113,7 +113,7 @@
/** The loaded classes cache, HashMap<String, Class>.
* Access synchronized via this.classes monitor.
*/
- private ConcurrentReaderHashMap classes = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap classes = new ConcurrentHashMap();
/** HashMap<UCL, HashSet<String>> class loaders to the set of class names
* loaded via the UCL.
@@ -137,7 +137,7 @@
* ClassLoaders which have classes in the package.
* Access synchronized via this.packagesMap monitor.
*/
- private ConcurrentReaderHashMap packagesMap = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap packagesMap = new ConcurrentHashMap();
/** A HashMap<UCL, String[]> of class loaders to the array of pckages names
* they serve
Index: jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java
===================================================================
--- jbossas4-4.2.3.GA.orig/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2008-07-18 17:06:25.000000000 +0200
+++ jbossas4-4.2.3.GA/jmx/src/main/org/jboss/mx/server/registry/BasicMBeanRegistry.java 2008-11-10 20:14:55.000000000 +0100
@@ -49,7 +49,7 @@
import javax.management.modelmbean.ModelMBeanInfo;
import javax.management.modelmbean.RequiredModelMBean;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
import org.jboss.logging.Logger;
import org.jboss.mx.loading.LoaderRepository;
@@ -96,7 +96,7 @@
* key properties to registry entries.
* domain -> canonicalKeyProperties -> MBeanEntry
*/
- private Map domainMap = new ConcurrentReaderHashMap();
+ private Map domainMap = new ConcurrentHashMap();
/**
* The default domain for this registry
@@ -959,9 +959,9 @@
Map mbeanMap = (Map) domainMap.get(domain);
if (mbeanMap == null && createIfMissing)
{
- mbeanMap = new ConcurrentReaderHashMap();
+ mbeanMap = new ConcurrentHashMap();
domainMap.put(domain, mbeanMap);
}
return mbeanMap;
}
-}
\ No newline at end of file
+}
Index: jbossas4-4.2.3.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java
===================================================================
--- jbossas4-4.2.3.GA.orig/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2008-07-18 17:07:52.000000000 +0200
+++ jbossas4-4.2.3.GA/management/src/main/org/jboss/management/j2ee/factory/EJBModuleFactory.java 2008-11-10 20:14:55.000000000 +0100
@@ -35,7 +35,7 @@
import org.jboss.metadata.BeanMetaData;
import org.jboss.metadata.SessionMetaData;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A factory for mapping EJBDeployer deployments to EJBModule
@@ -47,9 +47,9 @@
implements ManagedObjectFactory
{
private static Logger log = Logger.getLogger(EJBModuleFactory.class);
- private static Map moduleServiceToMgmtMap = new ConcurrentReaderHashMap();
- private Map deploymentToModuleNameMap = new ConcurrentReaderHashMap();
- private Map containerToModuleNameMap = new ConcurrentReaderHashMap();
+ private static Map moduleServiceToMgmtMap = new ConcurrentHashMap();
+ private Map deploymentToModuleNameMap = new ConcurrentHashMap();
+ private Map containerToModuleNameMap = new ConcurrentHashMap();
static ObjectName getEJBModuleName(ObjectName ejbModuleService)
{
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2008-07-18 17:08:03.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/SpyXAResourceManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.Map;
import java.util.ArrayList;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import javax.jms.JMSException;
import javax.transaction.xa.XAException;
@@ -62,7 +62,7 @@
/** The connection */
private Connection connection;
/** The transactions */
- private Map transactions = new ConcurrentReaderHashMap();
+ private Map transactions = new ConcurrentHashMap();
/** The next xid */
private long nextInternalXid = Long.MIN_VALUE;
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2008-07-18 17:07:59.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/ClientMonitorInterceptor.java 2008-11-10 20:14:55.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.mq.TransactionRequest;
import org.jboss.mq.il.jvm.JVMClientIL;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A pass through Interceptor, which keeps track of when a
@@ -54,7 +54,7 @@
public class ClientMonitorInterceptor extends JMSServerInterceptorSupport
{
//The list of Clients by ConnectionTokens
- ConcurrentReaderHashMap clients = new ConcurrentReaderHashMap();
+ ConcurrentHashMap clients = new ConcurrentHashMap();
private static class ClientStats
{
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2008-07-18 17:07:59.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/JMSDestinationManager.java 2008-11-10 20:14:55.000000000 +0100
@@ -56,7 +56,7 @@
import org.jboss.util.threadpool.ThreadPool;
import org.jboss.util.timeout.TimeoutFactory;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* This class implements the JMS provider
@@ -73,10 +73,10 @@
public final static String JBOSS_VERSION = "JBossMQ Version 4.0";
/** Destinations SpyDestination -> JMSDestination */
- public Map destinations = new ConcurrentReaderHashMap();
+ public Map destinations = new ConcurrentHashMap();
/** Destinations being closed SpyDestination -> JMSDestination */
- public Map closingDestinations = new ConcurrentReaderHashMap();
+ public Map closingDestinations = new ConcurrentHashMap();
/** Thread pool */
public ThreadPool threadPool;
@@ -88,7 +88,7 @@
public TimeoutFactory timeoutFactory;
/** The list of ClientConsumers hased by ConnectionTokens */
- Map clientConsumers = new ConcurrentReaderHashMap();
+ Map clientConsumers = new ConcurrentHashMap();
/** last id given to a client */
private int lastID = 1;
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2008-07-18 17:07:59.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/server/JMSTopic.java 2008-11-10 20:14:55.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.mq.pm.PersistenceManager;
import org.jboss.mq.pm.Tx;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* This class is a message queue which is stored (hashed by Destination) on the
@@ -56,8 +56,8 @@
{
//Hashmap of ExclusiveQueues
- ConcurrentReaderHashMap durQueues = new ConcurrentReaderHashMap();
- ConcurrentReaderHashMap tempQueues = new ConcurrentReaderHashMap();
+ ConcurrentHashMap durQueues = new ConcurrentHashMap();
+ ConcurrentHashMap tempQueues = new ConcurrentHashMap();
public JMSTopic(SpyDestination dest, ClientConsumer temporary, JMSDestinationManager server, BasicQueueParameters parameters) throws JMSException
{
Index: jbossas4-4.2.3.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java
===================================================================
--- jbossas4-4.2.3.GA.orig/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2008-07-18 17:07:47.000000000 +0200
+++ jbossas4-4.2.3.GA/security/src/main/org/jboss/security/jacc/DelegatingPolicy.java 2008-11-10 20:14:55.000000000 +0100
@@ -40,7 +40,7 @@
import javax.security.auth.Subject;
import org.jboss.logging.Logger;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A JAAC Policy provider implementation that delegates any non-JACC permissions
@@ -62,12 +62,12 @@
* Map<String, ContextPolicy> for the JACC context IDs that have been
* committed.
*/
- private ConcurrentReaderHashMap activePolicies = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap activePolicies = new ConcurrentHashMap();
/**
* Map<String, ContextPolicy> for the JACC policies that are in the open
* state and should be excluded from the active permission set.
*/
- private ConcurrentReaderHashMap openPolicies = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap openPolicies = new ConcurrentHashMap();
/**
* Flag indicating if our category is at trace level for logging
*/
Index: jbossas4-4.2.3.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java
===================================================================
--- jbossas4-4.2.3.GA.orig/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2008-07-18 17:07:46.000000000 +0200
+++ jbossas4-4.2.3.GA/security/src/main/org/jboss/security/jacc/JBossPolicyConfigurationFactory.java 2008-11-10 20:14:55.000000000 +0100
@@ -27,7 +27,7 @@
import javax.security.jacc.PolicyConfiguration;
import javax.security.jacc.PolicyContextException;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import org.jboss.util.state.StateMachine;
import org.jboss.util.state.xml.StateMachineParser;
@@ -40,7 +40,7 @@
extends PolicyConfigurationFactory
{
private StateMachine configStateMachine;
- private ConcurrentReaderHashMap policyConfigMap = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap policyConfigMap = new ConcurrentHashMap();
private DelegatingPolicy policy;
/** Build the JACC policy configuration state machine from the
Index: jbossas4-4.2.3.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java
===================================================================
--- jbossas4-4.2.3.GA.orig/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2008-07-18 17:07:46.000000000 +0200
+++ jbossas4-4.2.3.GA/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2008-11-10 20:14:55.000000000 +0100
@@ -63,7 +63,7 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.util.CachePolicy;
import org.jboss.util.TimedCachePolicy;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* This is a JMX service which manages JAAS based SecurityManagers.
@@ -109,7 +109,7 @@
private static String securityProxyFactoryClassName = "org.jboss.security.SubjectSecurityProxyFactory";
private static Class securityProxyFactoryClass = org.jboss.security.SubjectSecurityProxyFactory.class;
/** A mapping from security domain name to a SecurityDomainContext object */
- private static ConcurrentReaderHashMap securityDomainCtxMap = new ConcurrentReaderHashMap();
+ private static ConcurrentHashMap securityDomainCtxMap = new ConcurrentHashMap();
private static NameParser parser;
/** A flag indicating if the SecurityAssociation.setServer should be called */
private boolean serverMode = true;
Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/deployment/EARDeployment.java
===================================================================
--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/deployment/EARDeployment.java 2008-07-18 17:07:20.000000000 +0200
+++ jbossas4-4.2.3.GA/server/src/main/org/jboss/deployment/EARDeployment.java 2008-11-10 20:14:55.000000000 +0100
@@ -28,7 +28,7 @@
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.system.ServiceMBeanSupport;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* An EAR Deployment
@@ -53,7 +53,7 @@
// Attributes ----------------------------------------------------
private DeploymentInfo deploymentInfo;
- private ConcurrentReaderHashMap metadata = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap metadata = new ConcurrentHashMap();
// Static --------------------------------------------------------
Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java
===================================================================
--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2008-07-18 17:07:32.000000000 +0200
+++ jbossas4-4.2.3.GA/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceCache.java 2008-11-10 20:14:55.000000000 +0100
@@ -33,7 +33,7 @@
import org.jboss.ejb.EnterpriseContext;
import org.jboss.ejb.StatefulSessionEnterpriseContext;
import org.jboss.ejb.StatefulSessionPersistenceManager;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Cache for stateful session beans.
@@ -54,7 +54,7 @@
/** The map<id, Long> that holds passivated bean ids that have been removed
* from the cache and passivated to the pm along with the time of passivation
*/
- private ConcurrentReaderHashMap passivatedIDs = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap passivatedIDs = new ConcurrentHashMap();
/* Ids that are currently being activated */
private HashSet activating = new HashSet();
@@ -250,4 +250,4 @@
// Inner classes -------------------------------------------------
-}
\ No newline at end of file
+}
Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java
===================================================================
--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/invocation/InvocationStatistics.java 2008-07-18 17:07:37.000000000 +0200
+++ jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/InvocationStatistics.java 2008-11-10 20:14:55.000000000 +0100
@@ -27,7 +27,7 @@
import java.util.Iterator;
import java.util.Map;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/** A method invocation statistics collection class.
*
@@ -69,7 +69,7 @@
public InvocationStatistics()
{
- methodStats = new ConcurrentReaderHashMap();
+ methodStats = new ConcurrentHashMap();
}
/** Update the TimeStatistic for the given method. This synchronizes on
Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java
===================================================================
--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2008-07-18 17:07:36.000000000 +0200
+++ jbossas4-4.2.3.GA/server/src/main/org/jboss/invocation/pooled/interfaces/PooledInvokerProxy.java 2008-11-10 20:14:55.000000000 +0100
@@ -56,7 +56,7 @@
import org.jboss.tm.TransactionPropagationContextFactory;
import org.jboss.tm.TransactionPropagationContextUtil;
import org.jboss.logging.Logger;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
@@ -99,7 +99,7 @@
public static int MAX_RETRIES = 10;
/** A class wide pool Map<ServerAddres, LinkedList<ClientSocket>> */
- protected static final Map connectionPools = new ConcurrentReaderHashMap();
+ protected static final Map connectionPools = new ConcurrentHashMap();
/**
* connection information
Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/metadata/BeanMetaData.java 2008-07-18 17:07:20.000000000 +0200
+++ jbossas4-4.2.3.GA/server/src/main/org/jboss/metadata/BeanMetaData.java 2008-11-10 20:14:55.000000000 +0100
@@ -40,7 +40,7 @@
import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
@@ -126,13 +126,13 @@
private HashMap messageDestinationReferences = new HashMap();
/** The method attributes */
private ArrayList methodAttributes = new ArrayList();
- private ConcurrentReaderHashMap cachedMethodAttributes = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap cachedMethodAttributes = new ConcurrentHashMap();
/** The assembly-descriptor/method-permission element(s) info */
private ArrayList permissionMethods = new ArrayList();
/** The assembly-descriptor/container-transaction element(s) info */
private ArrayList transactionMethods = new ArrayList();
/** A cache mapping methods to transaction attributes. */
- private ConcurrentReaderHashMap methodTx = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap methodTx = new ConcurrentHashMap();
/** The assembly-descriptor/exclude-list method(s) */
private ArrayList excludedMethods = new ArrayList();
/** The invoker names to JNDI name mapping */
Index: jbossas4-4.2.3.GA/server/src/main/org/jboss/web/WebServer.java
===================================================================
--- jbossas4-4.2.3.GA.orig/server/src/main/org/jboss/web/WebServer.java 2008-07-18 17:07:38.000000000 +0200
+++ jbossas4-4.2.3.GA/server/src/main/org/jboss/web/WebServer.java 2008-11-10 20:14:55.000000000 +0100
@@ -39,7 +39,7 @@
import org.jboss.util.threadpool.BasicThreadPool;
import org.jboss.util.threadpool.BasicThreadPoolMBean;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A mini webserver that should be embedded in another application. It can
@@ -84,7 +84,7 @@
/**
* The map of class loaders registered with the web server
*/
- private final ConcurrentReaderHashMap loaderMap = new ConcurrentReaderHashMap();
+ private final ConcurrentHashMap loaderMap = new ConcurrentHashMap();
/**
* The web server http listening socket
Index: jbossas4-4.2.3.GA/system/src/main/org/jboss/deployment/SARDeployer.java
===================================================================
--- jbossas4-4.2.3.GA.orig/system/src/main/org/jboss/deployment/SARDeployer.java 2008-07-18 17:02:35.000000000 +0200
+++ jbossas4-4.2.3.GA/system/src/main/org/jboss/deployment/SARDeployer.java 2008-11-10 20:14:55.000000000 +0100
@@ -60,7 +60,7 @@
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* This is the main Service Deployer API.
@@ -109,7 +109,7 @@
* A Map<String, List<String>> of the suffix to accepted archive META-INF descriptor name
* @todo externalize this
*/
- private Map suffixToDescriptorMap = new ConcurrentReaderHashMap();
+ private Map suffixToDescriptorMap = new ConcurrentHashMap();
/** A flag indicating if the parser used for the service descriptor should be configured for namespaces */
private boolean useNamespaceAwareParser;
Index: jbossas4-4.2.3.GA/system/src/main/org/jboss/system/Registry.java
===================================================================
--- jbossas4-4.2.3.GA.orig/system/src/main/org/jboss/system/Registry.java 2008-07-18 17:02:37.000000000 +0200
+++ jbossas4-4.2.3.GA/system/src/main/org/jboss/system/Registry.java 2008-11-10 20:14:55.000000000 +0100
@@ -25,7 +25,7 @@
import org.jboss.logging.Logger;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A registry, really, a registry.
@@ -41,7 +41,7 @@
{
private static final Logger log = Logger.getLogger(Registry.class);
- public static Map entries = new ConcurrentReaderHashMap();
+ public static Map entries = new ConcurrentHashMap();
public static void bind(final Object key, final Object value)
{
Index: jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java
===================================================================
--- jbossas4-4.2.3.GA.orig/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2008-07-18 17:03:15.000000000 +0200
+++ jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jca/fs/FSDirContextAdaptor.java 2008-11-10 20:14:55.000000000 +0100
@@ -31,7 +31,7 @@
import javax.transaction.xa.XAResource;
import org.jboss.logging.Logger;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/** The ResourceAdapter for the file system based DirContext
*
@@ -44,7 +44,7 @@
private BootstrapContext ctx;
/** The activations by activation spec */
- private ConcurrentReaderHashMap activations = new ConcurrentReaderHashMap();
+ private ConcurrentHashMap activations = new ConcurrentHashMap();
/**
* Get the work manager
Index: jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java
===================================================================
--- jbossas4-4.2.3.GA.orig/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2008-07-18 17:03:17.000000000 +0200
+++ jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jca/inflow/TestResourceAdapter.java 2008-11-10 20:14:55.000000000 +0100
@@ -38,7 +38,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.mx.util.ObjectNameFactory;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/**
* A TestResourceAdapter.
@@ -52,7 +52,7 @@
BootstrapContext ctx;
- ConcurrentReaderHashMap endpoints = new ConcurrentReaderHashMap();
+ ConcurrentHashMap endpoints = new ConcurrentHashMap();
public TestResourceAdapterInflowResults testInflow() throws Exception
{
Index: jbossas4-4.2.3.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java
===================================================================
--- jbossas4-4.2.3.GA.orig/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2008-07-18 17:02:56.000000000 +0200
+++ jbossas4-4.2.3.GA/tomcat/src/main/org/jboss/web/tomcat/statistics/ReplicationStatistics.java 2008-11-10 20:14:55.000000000 +0100
@@ -25,7 +25,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/** A session replication statistics collection class.
*
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 9153807780893455734L;
/** A HashMap<String, TimeStatistic> of the method invocations */
- private ConcurrentReaderHashMap ctxStats;
+ private ConcurrentHashMap ctxStats;
/** Time of the last resetStats call */
public long lastResetTime = System.currentTimeMillis();
@@ -75,7 +75,7 @@
public ReplicationStatistics()
{
- ctxStats = new ConcurrentReaderHashMap();
+ ctxStats = new ConcurrentHashMap();
}
public void updatePassivationStats(String ctx, long elapsed)
Index: jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java
===================================================================
--- jbossas4-4.2.3.GA.orig/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2008-07-18 17:03:20.000000000 +0200
+++ jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/deployers/rar/mcf1/MCF1ManagedConnection.java 2008-11-10 20:14:55.000000000 +0100
@@ -34,7 +34,7 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.CopyOnWriteArraySet;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
public class MCF1ManagedConnection implements ManagedConnection, LocalTransaction
Index: jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java
===================================================================
--- jbossas4-4.2.3.GA.orig/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2008-07-18 17:03:06.000000000 +0200
+++ jbossas4-4.2.3.GA/testsuite/src/main/org/jboss/test/jcaprops/support/PropertyTestManagedConnection.java 2008-11-10 20:14:55.000000000 +0100
@@ -34,7 +34,7 @@
import javax.security.auth.Subject;
import javax.transaction.xa.XAResource;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.CopyOnWriteArraySet;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
/**
Index: jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java
===================================================================
--- jbossas4-4.2.3.GA.orig/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2008-07-18 17:08:02.000000000 +0200
+++ jbossas4-4.2.3.GA/messaging/src/main/org/jboss/mq/il/uil2/UILServerILService.java 2008-11-10 20:14:55.000000000 +0100
@@ -41,7 +41,7 @@
import org.jboss.security.SecurityDomain;
import org.jboss.system.server.ServerConfigUtil;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CopyOnWriteArrayList;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedBoolean;
/** This is the server side MBean for the UIL2 transport layer.
Index: jbossas4-4.2.3.GA/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java
===================================================================
--- jbossas4-4.2.3.GA.orig/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java 2008-07-18 17:02:34.000000000 +0200
+++ jbossas4-4.2.3.GA/system/src/tests/org/jboss/test/system/controller/SimpleSARDeployer.java 2008-11-10 20:14:55.000000000 +0100
@@ -41,7 +41,7 @@
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
-import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* SimpleSARDeployer.
![[patchlogo]](http://patch-tracker.debian.org/static/img/swirlpatch.png)