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 2B7DEDE48 for ; Thu, 15 Nov 2012 06:53:22 +0000 (UTC) Received: (qmail 40493 invoked by uid 500); 15 Nov 2012 06:53:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 40370 invoked by uid 500); 15 Nov 2012 06:53:21 -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 40358 invoked by uid 99); 15 Nov 2012 06:53:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2012 06:53:20 +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 06:53:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BB6522388980; Thu, 15 Nov 2012 06:52:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1409665 - /cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java Date: Thu, 15 Nov 2012 06:52:59 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121115065259.BB6522388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Thu Nov 15 06:52:59 2012 New Revision: 1409665 URL: http://svn.apache.org/viewvc?rev=1409665&view=rev Log: Fixed the NPE of WadlGeneratorTest on AIX JDK Modified: cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java Modified: cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java?rev=1409665&r1=1409664&r2=1409665&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/message/MessageImpl.java Thu Nov 15 06:52:59 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); } }