cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asold...@apache.org
Subject svn commit: r1447648 - in /cxf/branches/2.6.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java
Date Tue, 19 Feb 2013 09:52:06 GMT
Author: asoldano
Date: Tue Feb 19 09:52:06 2013
New Revision: 1447648

URL: http://svn.apache.org/r1447648
Log:
Merged revisions 1447647 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

................
  r1447647 | asoldano | 2013-02-19 10:43:02 +0100 (Tue, 19 Feb 2013) | 9 lines
  
  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.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 19 09:52:06 2013
@@ -0,0 +1,2 @@
+/cxf/branches/2.7.x-fixes:1447647
+/cxf/trunk:1447423

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java?rev=1447648&r1=1447647&r2=1447648&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java
(original)
+++ cxf/branches/2.6.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ToolException.java
Tue Feb 19 09:52:06 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: ");
         }
     }    



Mime
View raw message