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 B0D31EFF6 for ; Sun, 23 Dec 2012 22:25:33 +0000 (UTC) Received: (qmail 9676 invoked by uid 500); 23 Dec 2012 22:25:33 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 9613 invoked by uid 500); 23 Dec 2012 22:25:33 -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 9606 invoked by uid 99); 23 Dec 2012 22:25:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 22:25:33 +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; Sun, 23 Dec 2012 22:25:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 03DB0238899C; Sun, 23 Dec 2012 22:25:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1425540 - /cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java Date: Sun, 23 Dec 2012 22:25:11 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121223222512.03DB0238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ay Date: Sun Dec 23 22:25:11 2012 New Revision: 1425540 URL: http://svn.apache.org/viewvc?rev=1425540&view=rev Log: jdk15 build fix for CXF-4723 Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java?rev=1425540&r1=1425539&r2=1425540&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java Sun Dec 23 22:25:11 2012 @@ -18,7 +18,6 @@ */ package org.apache.cxf.staxutils.transform; -import java.util.Deque; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -31,8 +30,8 @@ import javax.xml.namespace.NamespaceCont class DelegatingNamespaceContext implements NamespaceContext { private NamespaceContext nc; private Map nsMap; - private Deque> namespaces; - private Deque> prefixes; + private List> namespaces; + private List> prefixes; public DelegatingNamespaceContext(NamespaceContext nc, Map nsMap) { this.nc = nc; @@ -42,18 +41,18 @@ class DelegatingNamespaceContext impleme } public void down() { - namespaces.addFirst(new HashMap(8)); - prefixes.addFirst(new HashMap(8)); + ((LinkedList>)namespaces).addFirst(new HashMap(8)); + ((LinkedList>)prefixes).addFirst(new HashMap(8)); } public void up() { - namespaces.removeFirst(); - prefixes.removeFirst(); + ((LinkedList>)namespaces).removeFirst(); + ((LinkedList>)prefixes).removeFirst(); } public void addPrefix(String prefix, String ns) { - namespaces.getFirst().put(prefix, ns); - prefixes.getFirst().put(ns, prefix); + ((LinkedList>)namespaces).getFirst().put(prefix, ns); + ((LinkedList>)prefixes).getFirst().put(ns, prefix); } public String findUniquePrefix(String ns) { @@ -77,7 +76,7 @@ class DelegatingNamespaceContext impleme public String getNamespaceURI(String prefix) { if (!namespaces.isEmpty()) { - Map cache = namespaces.getFirst(); + Map cache = ((LinkedList>)namespaces).getFirst(); for (Map nss : namespaces) { String ns = nss.get(prefix); if (ns != null) { @@ -111,7 +110,7 @@ class DelegatingNamespaceContext impleme } if (!prefixes.isEmpty()) { - Map cache = prefixes.getFirst(); + Map cache = ((LinkedList>)prefixes).getFirst(); for (Map pfs : prefixes) { String prefix = pfs.get(ns); if (prefix != null && ns.equals(getNamespaceURI(prefix))) {