cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1299007 - in /cxf/branches/2.4.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Date Fri, 09 Mar 2012 19:51:41 GMT
Author: dkulp
Date: Fri Mar  9 19:51:40 2012
New Revision: 1299007

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

........
  r1298965 | dkulp | 2012-03-09 13:34:26 -0500 (Fri, 09 Mar 2012) | 9 lines
  
  Merged revisions 1298956 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1298956 | dkulp | 2012-03-09 13:18:03 -0500 (Fri, 09 Mar 2012) | 2 lines
  
    Fix potential NPE
  
  ........
........

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

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

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

Modified: cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1299007&r1=1299006&r2=1299007&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Fri Mar  9 19:51:40 2012
@@ -852,7 +852,11 @@ public final class JAXBEncoderDecoder {
                 f.setAccessible(true);
                 String ns[] = (String[])f.get(c);
                 for (int x = 0; x < ns.length; x += 2) {
-                    nsMap.put(ns[x], ns[x + 1]);
+                    if (ns[x] == null) {
+                        nsMap.put(null, ns[x + 1]);
+                    } else {
+                        nsMap.put(ns[x], ns[x + 1]);
+                    }
                 }
             }
         } catch (Throwable t) {



Mime
View raw message