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 05621DF1F for ; Thu, 15 Nov 2012 07:22:04 +0000 (UTC) Received: (qmail 2829 invoked by uid 500); 15 Nov 2012 07:22:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 2627 invoked by uid 500); 15 Nov 2012 07:22:02 -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 2615 invoked by uid 99); 15 Nov 2012 07:22:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2012 07:22:01 +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; Thu, 15 Nov 2012 07:21:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 814DC2388A6E; Thu, 15 Nov 2012 07:21:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1409672 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/java/org/apache/cxf/message/MessageImpl.java Date: Thu, 15 Nov 2012 07:21:38 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121115072138.814DC2388A6E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Thu Nov 15 07:21:37 2012 New Revision: 1409672 URL: http://svn.apache.org/viewvc?rev=1409672&view=rev Log: Merged revisions 1409665 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1409665 | ningjiang | 2012-11-15 14:52:59 +0800 (Thu, 15 Nov 2012) | 1 line Fixed the NPE of WadlGeneratorTest on AIX JDK ........ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1409665 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java?rev=1409672&r1=1409671&r2=1409672&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java (original) +++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/message/MessageImpl.java Thu Nov 15 07:21:37 2012 @@ -181,7 +181,7 @@ public class MessageImpl extends StringM private static final long serialVersionUID = 7067290677790419348L; public void putAll(Map m) { - if (m != null) { + if (m != null && m.size() > 0) { super.putAll(m); } }