Remove UnlockedReadHashMap

jboss-msc · Dec 15, 2016 · 9485293 · 9485293
1 parent 2327a14
commit 9485293
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 419 deletions.
diff --git a/src/main/java/org/jboss/msc/service/ServiceContainerImpl.java b/src/main/java/org/jboss/msc/service/ServiceContainerImpl.java
@@ -48,6 +48,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
@@ -92,7 +93,7 @@ public String run() {
         ServiceLogger.ROOT.greeting(Version.getVersionString());
     }
 
-    private final ConcurrentMap<ServiceName, ServiceRegistrationImpl> registry = new UnlockedReadHashMap<ServiceName, ServiceRegistrationImpl>(512);
+    private final ConcurrentMap<ServiceName, ServiceRegistrationImpl> registry = new ConcurrentHashMap<ServiceName, ServiceRegistrationImpl>(512);
     private final long start = System.nanoTime();
 
     private final Set<ServiceController<?>> problems = new IdentityHashSet<ServiceController<?>>();

diff --git a/src/main/java/org/jboss/msc/service/ServiceNameMapper.java b/src/main/java/org/jboss/msc/service/ServiceNameMapper.java
@@ -22,6 +22,7 @@
 
 package org.jboss.msc.service;
 
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
@@ -95,7 +96,7 @@ static final class Node<V> {
         @SuppressWarnings("unchecked")
         private static final AtomicReferenceFieldUpdater<Node, Object> valueUpdater = AtomicReferenceFieldUpdater.newUpdater(Node.class, Object.class, "value");
 
-        private final ConcurrentMap<Object, Node<V>> childMap = new UnlockedReadHashMap<Object, Node<V>>();
+        private final ConcurrentMap<Object, Node<V>> childMap = new ConcurrentHashMap<Object, Node<V>>();
         @SuppressWarnings("unused")
         private volatile V value;