Author: dkulp Date: Thu Mar 15 21:18:04 2012 New Revision: 1301208 URL: http://svn.apache.org/viewvc?rev=1301208&view=rev Log: 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.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 (original) +++ svn:mergeinfo Thu Mar 15 21:18:04 2012 @@ -1,2 +1,2 @@ -/cxf/branches/2.5.x-fixes:1299092,1299637,1299725,1300270,1300343,1300407-1300533,1300536,1300560 -/cxf/trunk:1298470,1298830,1298832,1299086,1299635,1299682,1299747,1300342,1300518,1300530,1300555 +/cxf/branches/2.5.x-fixes:1299092,1299637,1299725,1300270,1300343,1300407-1300533,1300536,1300560,1301205 +/cxf/trunk:1298470,1298830,1298832,1299086,1299635,1299682,1299747,1300342,1300518,1300530,1300555,1301201 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=1301208&r1=1301207&r2=1301208&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 Thu Mar 15 21:18:04 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]); }
