Michal Srb 3452d7
From cc644b2c2073acac30cc80d3a160c1007bad4213 Mon Sep 17 00:00:00 2001
Michal Srb f2ef21
From: Michal Srb <msrb@redhat.com>
Michal Srb f2ef21
Date: Tue, 2 Jul 2013 12:54:37 +0200
Michal Srb 3452d7
Subject: [PATCH] Remove references to ConcurrentReaderHashMap
Michal Srb f2ef21
Michal Srb f2ef21
File ConcurrentReaderHashMap.java has been removed due to unclear licensing
Michal Srb f2ef21
---
Michal Srb 3452d7
 src/java/org/dom4j/tree/NamespaceCache.java | 8 ++++----
Michal Srb 3452d7
 1 file changed, 4 insertions(+), 4 deletions(-)
Michal Srb f2ef21
Michal Srb f2ef21
diff --git a/src/java/org/dom4j/tree/NamespaceCache.java b/src/java/org/dom4j/tree/NamespaceCache.java
Michal Srb 3452d7
index 89ff316..9b716de 100644
Michal Srb f2ef21
--- a/src/java/org/dom4j/tree/NamespaceCache.java
Michal Srb f2ef21
+++ b/src/java/org/dom4j/tree/NamespaceCache.java
Michal Srb 3452d7
@@ -9,7 +9,9 @@ package org.dom4j.tree;
Michal Srb f2ef21
 
Michal Srb f2ef21
 import java.lang.ref.WeakReference;
Michal Srb f2ef21
 import java.lang.reflect.Constructor;
Michal Srb f2ef21
+import java.lang.UnsupportedOperationException;
Michal Srb f2ef21
 import java.util.Map;
Michal Srb 3452d7
+import java.util.concurrent.ConcurrentHashMap;
Michal Srb f2ef21
 
Michal Srb f2ef21
 import org.dom4j.Namespace;
Michal Srb 3452d7
 
Michal Srb 3452d7
@@ -59,9 +61,7 @@ public class NamespaceCache {
Michal Srb f2ef21
                 cache = (Map) clazz.newInstance();
Michal Srb f2ef21
                 noPrefixCache = (Map) clazz.newInstance();
Michal Srb f2ef21
             } catch (Throwable t2) {
Michal Srb f2ef21
-                /* If previous implementations fail, use internal one */
Michal Srb f2ef21
-                cache = new ConcurrentReaderHashMap();
Michal Srb f2ef21
-                noPrefixCache = new ConcurrentReaderHashMap();
Michal Srb f2ef21
+                throw new UnsupportedOperationException("ConcurrentReaderHashMap is not available");
Michal Srb f2ef21
             }
Michal Srb f2ef21
         }
Michal Srb f2ef21
     }
Michal Srb 3452d7
@@ -154,7 +154,7 @@ public class NamespaceCache {
Michal Srb 3452d7
                 answer = (Map) cache.get(uri);
Michal Srb 3452d7
 
Michal Srb 3452d7
                 if (answer == null) {
Michal Srb 3452d7
-                    answer = new ConcurrentReaderHashMap();
Michal Srb 3452d7
+                    answer = new ConcurrentHashMap();
Michal Srb 3452d7
                     cache.put(uri, answer);
Michal Srb 3452d7
                 }
Michal Srb 3452d7
             }
Michal Srb f2ef21
-- 
Michal Srb f2ef21
1.8.1.4
Michal Srb f2ef21