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 B1C87D0FB for ; Mon, 26 Nov 2012 08:46:31 +0000 (UTC) Received: (qmail 57508 invoked by uid 500); 26 Nov 2012 08:46:30 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 57347 invoked by uid 500); 26 Nov 2012 08:46:27 -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 57303 invoked by uid 99); 26 Nov 2012 08:46:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Nov 2012 08:46:26 +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; Mon, 26 Nov 2012 08:46:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D9ECB23888CD; Mon, 26 Nov 2012 08:46:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1413509 - in /cxf/branches/2.4.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java Date: Mon, 26 Nov 2012 08:46:04 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121126084604.D9ECB23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Mon Nov 26 08:46:04 2012 New Revision: 1413509 URL: http://svn.apache.org/viewvc?rev=1413509&view=rev Log: Merged revisions 1413506 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1413506 | ffang | 2012-11-26 16:34:59 +0800 (δΈ€, 26 11 2012) | 1 line [CXF-4652]Additional namespace is added when web service provider implements Provider ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.5.x-fixes:r1413506 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java?rev=1413509&r1=1413508&r2=1413509&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java (original) +++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java Mon Nov 26 08:46:04 2012 @@ -370,6 +370,9 @@ public class W3CDOMStreamReader extends String ln = getCurrentNode().getLocalName(); if (ln == null) { ln = getCurrentNode().getNodeName(); + if (ln.indexOf(":") != -1) { + ln = ln.substring(ln.indexOf(":") + 1); + } } return ln; } @@ -391,7 +394,12 @@ public class W3CDOMStreamReader extends public String getPrefix() { String prefix = getCurrentNode().getPrefix(); if (prefix == null) { - prefix = ""; + String nodeName = getCurrentNode().getNodeName(); + if (nodeName.indexOf(":") != -1) { + prefix = nodeName.substring(0, nodeName.indexOf(":")); + } else { + prefix = ""; + } } return prefix; }