cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1310514 - in /cxf/branches/2.3.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Date Fri, 06 Apr 2012 17:58:28 GMT
Author: dkulp
Date: Fri Apr  6 17:58:27 2012
New Revision: 1310514

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

........
  r1310462 | dkulp | 2012-04-06 12:37:19 -0400 (Fri, 06 Apr 2012) | 17 lines
  
  Merged revisions 1307675 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ........
    r1307675 | dkulp | 2012-03-30 21:02:59 -0400 (Fri, 30 Mar 2012) | 9 lines
    
    Merged revisions 1307654 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1307654 | dkulp | 2012-03-30 19:53:28 -0400 (Fri, 30 Mar 2012) | 2 lines
    
      If repairing, check the attribute namespaces as well.
    
    ........
  ........
  
........

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/
------------------------------------------------------------------------------
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=1310514&r1=1310513&r2=1310514&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
Fri Apr  6 17:58:27 2012
@@ -781,6 +781,9 @@ public final class StaxUtils {
                     } else if (attrPrefix.length() == 0) {
                         writer.writeAttribute(attns, name, value);
                     } else {
+                        if (repairing && DOMUtils.getNamespace(e, attrPrefix) ==
null) {
+                            writer.writeNamespace(attrPrefix, attns);
+                        }
                         writer.writeAttribute(attrPrefix, attns, name, value);
                     }                    
                 }



Mime
View raw message