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 70A44DBC4 for ; Thu, 4 Oct 2012 17:50:20 +0000 (UTC) Received: (qmail 47673 invoked by uid 500); 4 Oct 2012 17:50:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 47599 invoked by uid 500); 4 Oct 2012 17:50: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 47591 invoked by uid 99); 4 Oct 2012 17:50: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 17:50: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 17:50:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id ECECF2388A29; Thu, 4 Oct 2012 17:49:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1394172 - /cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java Date: Thu, 04 Oct 2012 17:49:33 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121004174933.ECECF2388A29@eris.apache.org> Author: dkulp Date: Thu Oct 4 17:49:33 2012 New Revision: 1394172 URL: http://svn.apache.org/viewvc?rev=1394172&view=rev Log: Merged revisions 1394163 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1394163 | dkulp | 2012-10-04 13:21:53 -0400 (Thu, 04 Oct 2012) | 2 lines Fix an issue when using the W3CDOMStreamWriter with the dom4j dom implementation. ........ Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java?rev=1394172&r1=1394171&r2=1394172&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java Thu Oct 4 17:49:33 2012 @@ -82,11 +82,11 @@ public class W3CNamespaceContext impleme String val = a.getValue(); if (val != null && val.equals(uri)) { - String name = a.getNodeName(); + String name = a.getLocalName(); if ("xmlns".equals(name)) { return ""; } else { - return name.substring(6); + return name; } } }