Author: dkulp Date: Thu Oct 4 18:52:21 2012 New Revision: 1394205 URL: http://svn.apache.org/viewvc?rev=1394205&view=rev Log: Merged revisions 1394193 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1394193 | dkulp | 2012-10-04 14:27:27 -0400 (Thu, 04 Oct 2012) | 18 lines Merged revisions 1394172 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1394172 | dkulp | 2012-10-04 13:49:33 -0400 (Thu, 04 Oct 2012) | 10 lines 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.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java Modified: cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java?rev=1394205&r1=1394204&r2=1394205&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java (original) +++ cxf/branches/2.4.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java Thu Oct 4 18:52:21 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; } } }
