Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0D94CDCB1 for ; Thu, 4 Oct 2012 19:35:21 +0000 (UTC) Received: (qmail 20765 invoked by uid 500); 4 Oct 2012 19:35:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 20708 invoked by uid 500); 4 Oct 2012 19:35:20 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 20701 invoked by uid 99); 4 Oct 2012 19:35:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2012 19:35:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2012 19:35:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C1F1E2388A29; Thu, 4 Oct 2012 19:34:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121004193434.C1F1E2388A29@eris.apache.org> 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(); } else if (cls.equals(ConcurrentMap.class)) { map = new ConcurrentHashMap(); - } else if (cls.equals(ConcurrentNavigableMap.class)) { - map = new ConcurrentSkipListMap(); - } else if (cls.equals(SortedMap.class) || cls.equals(NavigableMap.class)) { + } else if (cls.equals(SortedMap.class)) { map = new TreeMap(); } else if (cls.isInterface()) { map = new HashMap();