You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/03/15 22:15:48 UTC
svn commit: r1301205 - in /cxf/branches/2.5.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Author: dkulp
Date: Thu Mar 15 21:15:48 2012
New Revision: 1301205
URL: http://svn.apache.org/viewvc?rev=1301205&view=rev
Log:
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.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 15 21:15:48 2012
@@ -1 +1 @@
-/cxf/trunk:1236902,1297296,1298470,1298601-1298624,1298830,1298832,1299086,1299635,1299682,1299707,1299747,1299900-1300084,1300342,1300509,1300518,1300523,1300530,1300541,1300555
+/cxf/trunk:1236902,1297296,1298470,1298601-1298624,1298830,1298832,1299086,1299635,1299682,1299707,1299747,1299900-1300084,1300342,1300509,1300518,1300523,1300530,1300541,1300555,1301201
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1301205&r1=1301204&r2=1301205&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Thu Mar 15 21:15:48 2012
@@ -872,7 +872,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]);
}