Fixed [Issue#71] for 1.9.x
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 0e1de69..5fcc5d4 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -9,6 +9,7 @@
Fixes:
* [JACKSON-855]: add StackOverflowError as root cause
* [Issue#57]: Allow serialization of JDK proxy types
+ * [Issue#71]: java.util.concurrent.ConcurrentNavigableMap support was failing
------------------------------------------------------------------------
=== History: ===
diff --git a/src/mapper/java/org/codehaus/jackson/map/deser/BasicDeserializerFactory.java b/src/mapper/java/org/codehaus/jackson/map/deser/BasicDeserializerFactory.java
index 8a11d03..74e5c95 100644
--- a/src/mapper/java/org/codehaus/jackson/map/deser/BasicDeserializerFactory.java
+++ b/src/mapper/java/org/codehaus/jackson/map/deser/BasicDeserializerFactory.java
@@ -71,12 +71,13 @@
*/
_mapFallbacks.put("java.util.NavigableMap", TreeMap.class);
try {
- Class<?> key = Class.forName("java.util.ConcurrentNavigableMap");
- Class<?> value = Class.forName("java.util.ConcurrentSkipListMap");
+ Class<?> key = Class.forName("java.util.concurrent.ConcurrentNavigableMap");
+ Class<?> value = Class.forName("java.util.concurrent.ConcurrentSkipListMap");
@SuppressWarnings("unchecked")
Class<? extends Map<?,?>> mapValue = (Class<? extends Map<?,?>>) value;
_mapFallbacks.put(key.getName(), mapValue);
} catch (ClassNotFoundException cnfe) { // occurs on 1.5
+ } catch (SecurityException se) {
}
}
