cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1304508 - in /cxf/branches/2.3.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Date Fri, 23 Mar 2012 17:24:54 GMT
Author: dkulp
Date: Fri Mar 23 17:24:53 2012
New Revision: 1304508

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

........
  r1301208 | dkulp | 2012-03-15 17:18:04 -0400 (Thu, 15 Mar 2012) | 16 lines
  
  Merged revisions 1301205 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
  
  ................
    r1301205 | dkulp | 2012-03-15 17:15:48 -0400 (Thu, 15 Mar 2012) | 9 lines
    
    Merged revisions 1301201 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1301201 | dkulp | 2012-03-15 17:06:34 -0400 (Thu, 15 Mar 2012) | 1 line
      
      Once again, fix NPE
    ........
  ................
  
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java

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

Modified: cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1304508&r1=1304507&r2=1304508&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Fri Mar 23 17:24:53 2012
@@ -853,7 +853,7 @@ public final class JAXBEncoderDecoder {
                 String ns[] = (String[])f.get(c);
                 for (int x = 0; x < ns.length; x += 2) {
                     if (ns[x] == null) {
-                        nsMap.put(null, ns[x + 1]);
+                        nsMap.put("", ns[x + 1]);
                     } else {
                         nsMap.put(ns[x], ns[x + 1]);
                     }



Mime
View raw message