cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1150838 - in /cxf/branches/2.3.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Date Mon, 25 Jul 2011 18:43:44 GMT
Author: dkulp
Date: Mon Jul 25 18:43:43 2011
New Revision: 1150838

URL: http://svn.apache.org/viewvc?rev=1150838&view=rev
Log:
Merged revisions 1149607 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1149607 | dkulp | 2011-07-22 09:48:34 -0400 (Fri, 22 Jul 2011) | 9 lines
  
  Merged revisions 1149605 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1149605 | dkulp | 2011-07-22 09:43:51 -0400 (Fri, 22 Jul 2011) | 1 line
    
    Remove a el.setPrefix call
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/branches/2.4.x-fixes:1149607

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1150838&r1=1150837&r2=1150838&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++ cxf/branches/2.3.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Mon Jul 25 18:43:43 2011
@@ -955,10 +955,13 @@ public final class StaxUtils {
             switch (event) {
             case XMLStreamConstants.START_ELEMENT: {
                 elementCount++;
-                Element e = doc.createElementNS(reader.getNamespaceURI(), reader.getLocalName());
+                Element e;
                 if (!StringUtils.isEmpty(reader.getPrefix())) {
-                    e.setPrefix(reader.getPrefix());
-                }       
+                    e = doc.createElementNS(reader.getNamespaceURI(), 
+                                            reader.getPrefix() + ":" + reader.getLocalName());
+                } else {
+                    e = doc.createElementNS(reader.getNamespaceURI(), reader.getLocalName());
+                }
                 e = (Element)parent.appendChild(e);
                 recordLoc = addLocation(doc, e, reader, recordLoc);
 



Mime
View raw message