Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7986692F4 for ; Fri, 23 Mar 2012 17:22:16 +0000 (UTC) Received: (qmail 33441 invoked by uid 500); 23 Mar 2012 17:22:16 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 33334 invoked by uid 500); 23 Mar 2012 17:22:16 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 33327 invoked by uid 99); 23 Mar 2012 17:22:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2012 17:22:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Mar 2012 17:22:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 17A522388860; Fri, 23 Mar 2012 17:21:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1304501 - in /cxf/branches/2.3.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Date: Fri, 23 Mar 2012 17:21:55 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120323172155.17A522388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {