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 6E9B2E0E4 for ; Tue, 19 Feb 2013 09:43:27 +0000 (UTC) Received: (qmail 9868 invoked by uid 500); 19 Feb 2013 09:43:26 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 9698 invoked by uid 500); 19 Feb 2013 09:43:24 -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 9661 invoked by uid 99); 19 Feb 2013 09:43:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 09:43:23 +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; Tue, 19 Feb 2013 09:43:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4B25923889DE; Tue, 19 Feb 2013 09:43:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1447647 - in /cxf/branches/2.7.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java Date: Tue, 19 Feb 2013 09:43:03 -0000 To: commits@cxf.apache.org From: asoldano@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130219094303.4B25923889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: asoldano Date: Tue Feb 19 09:43:02 2013 New Revision: 1447647 URL: http://svn.apache.org/r1447647 Log: Merged revisions 1447423 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1447423 | asoldano | 2013-02-18 19:40:42 +0100 (Mon, 18 Feb 2013) | 2 lines [CXF-4833] Adding missing check on hasSuppressed in ToolException ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ svn:mergeinfo = /cxf/trunk:1447423 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java?rev=1447647&r1=1447646&r2=1447647&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java (original) +++ cxf/branches/2.7.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java Tue Feb 19 09:43:02 2013 @@ -117,7 +117,7 @@ public class ToolException extends Runti // Print cause, if any Throwable ourCause = getCause(); - if (ourCause != null && ourCause != suppressed.get(0)) { + if (ourCause != null && (!hasSuppressed || ourCause != suppressed.get(0))) { printThrowable(ourCause, ps, pfx + "/t", "Caused by: "); } }