Changeset 2091

Timestamp:

08/15/12 09:48:31 (12 years ago)

Author:

oschonef

Message:

• be really consequent about thread-unsafeness and remove ConcurrentMap?

File:

• SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUClient.java (modified) (3 diffs)

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUClient.java

@@ -23 +23 @@
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -66 +66 @@
     private final SRUVersion defaultVersion;
     private final HttpClient httpClient;
-    private final ConcurrentMap<String, SRURecordDataParser> parsers =
-            new ConcurrentHashMap<String, SRURecordDataParser>();
+    private final Map<String, SRURecordDataParser> parsers =
+            new HashMap<String, SRURecordDataParser>();
     private final XmlStreamReaderProxy proxy = new XmlStreamReaderProxy();
 
@@ -116 +116 @@
         }
 
-        SRURecordDataParser old = parsers.putIfAbsent(recordSchema, parser);
-        if (old != null) {
+        if (!parsers.containsKey(recordSchema)) {
+            parsers.put(recordSchema, parser);
+        } else {
             throw new SRUClientException(
                     "record data parser already registered: " + recordSchema);