cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1479742 - in /cxf/branches/2.5.x-fixes: ./ common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Date Tue, 07 May 2013 00:44:07 GMT
Author: ay
Date: Tue May  7 00:44:06 2013
New Revision: 1479742

URL: http://svn.apache.org/r1479742
Log:
Merged revisions 1479737 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1479737 | ay | 2013-05-07 02:36:57 +0200 (Tue, 07 May 2013) | 17 lines
  
  Merged revisions 1479736 via  svn merge from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
  
  ........
    r1479736 | ay | 2013-05-07 02:34:16 +0200 (Tue, 07 May 2013) | 9 lines
    
    Merged revisions 1479735 via  svn merge from
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1479735 | ay | 2013-05-07 02:27:25 +0200 (Tue, 07 May 2013) | 1 line
      
      [CXF-5004] NPE at StaxUtils.copy for empty namespaces under JDK's XMLStreamReader
    ........
    
  ........
  
........

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

Propchange: cxf/branches/2.5.x-fixes/
            ('svn:mergeinfo' removed)

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

Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1479742&r1=1479741&r2=1479742&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
(original)
+++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Tue May  7 00:44:06 2013
@@ -740,6 +740,9 @@ public final class StaxUtils {
             if (nsPrefix == null) {
                 nsPrefix = "";
             }
+            if (nsURI == null) {
+                nsURI = "";
+            }
             if (nsPrefix.length() == 0) {
                 writer.writeDefaultNamespace(nsURI);
                 writer.setDefaultNamespace(nsURI);



Mime
View raw message