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/23 18:21:55 UTC
svn commit: r1304501 - in /cxf/branches/2.3.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Author: dkulp
Date: Fri Mar 23 17:21:54 2012
New Revision: 1304501
URL: http://svn.apache.org/viewvc?rev=1304501&view=rev
Log:
Merged revisions 1299007 via svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........
r1299007 | dkulp | 2012-03-09 14:51:40 -0500 (Fri, 09 Mar 2012) | 17 lines
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.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/
('svn:mergeinfo' removed)
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=1304501&r1=1304500&r2=1304501&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:21:54 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) {