Author: dkulp
Date: Mon Apr 12 04:02:29 2010
New Revision: 933088
URL: http://svn.apache.org/viewvc?rev=933088&view=rev
Log:
Merged revisions 933085 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r933085 | dkulp | 2010-04-11 23:55:39 -0400 (Sun, 11 Apr 2010) | 2 lines
[CXF=2752] Default xmlns decls that come from non-woodstox parsers may
have a null namespace as well.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java?rev=933088&r1=933087&r2=933088&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
(original)
+++
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
Mon Apr 12 04:02:29 2010
@@ -170,7 +170,7 @@ public class W3CDOMStreamWriter implemen
public void writeAttribute(String local, String value) throws
XMLStreamException {
Attr a;
- if (local.startsWith("xmlns:")) {
+ if (local.startsWith("xmlns") && (local.length() == 5 ||
local.charAt(5) == ':')) {
a = document.createAttributeNS(XML_NS, local);
} else {
a = document.createAttributeNS(null, local);