Author: dkulp
Date: Fri Mar 9 18:34:26 2012
New Revision: 1298965
URL: http://svn.apache.org/viewvc?rev=1298965&view=rev
Log:
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.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
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=1298965&r1=1298964&r2=1298965&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
Fri Mar 9 18:34:26 2012
@@ -871,7 +871,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) {
