Blame SOURCES/dom4j-1.6.1-Remove-references-to-ConcurrentReaderHashMap.patch

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