cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1394221 - /cxf/branches/2.5.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
Date Thu, 04 Oct 2012 19:34:34 GMT
Author: dkulp
Date: Thu Oct  4 19:34:34 2012
New Revision: 1394221

URL: http://svn.apache.org/viewvc?rev=1394221&view=rev
Log:
Merged revisions 1394219 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1394219 | dkulp | 2012-10-04 15:28:56 -0400 (Thu, 04 Oct 2012) | 2 lines

  Couple types introduced in Java6

........

Modified:
    cxf/branches/2.5.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java

Modified: cxf/branches/2.5.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java?rev=1394221&r1=1394220&r2=1394221&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
Thu Oct  4 19:34:34 2012
@@ -29,8 +29,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentNavigableMap;
-import java.util.concurrent.ConcurrentSkipListMap;
 
 import javax.xml.namespace.QName;
 
@@ -132,9 +130,7 @@ public class MapType extends AegisType {
             map = new Hashtable<Object, Object>();
         } else if (cls.equals(ConcurrentMap.class)) {
             map = new ConcurrentHashMap<Object, Object>();
-        } else if (cls.equals(ConcurrentNavigableMap.class)) {
-            map = new ConcurrentSkipListMap<Object, Object>();
-        } else if (cls.equals(SortedMap.class) || cls.equals(NavigableMap.class)) {
+        } else if (cls.equals(SortedMap.class)) {
             map = new TreeMap<Object, Object>();
         } else if (cls.isInterface()) {
             map = new HashMap<Object, Object>();



Mime
View raw message