You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2013/02/19 10:43:03 UTC
svn commit: r1447647 - in /cxf/branches/2.7.x-fixes: ./
tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java
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: ");
}
}