cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r992002 - in /cxf/branches/2.2.x-fixes: ./ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
Date Thu, 02 Sep 2010 16:18:36 GMT
Author: dkulp
Date: Thu Sep  2 16:18:31 2010
New Revision: 992002

URL: http://svn.apache.org/viewvc?rev=992002&view=rev
Log:
Merged revisions 992000 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r992000 | dkulp | 2010-09-02 12:17:04 -0400 (Thu, 02 Sep 2010) | 1 line
  
  [CXF-2962] Add a better NPE guard
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  2 16:18:31 2010
@@ -1 +1 @@
-/cxf/trunk:989123,989434,990386,990593,991324,991416,991797
+/cxf/trunk:989123,989434,990386,990593,991324,991416,991797,992000

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

Modified: cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java?rev=992002&r1=992001&r2=992002&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
(original)
+++ cxf/branches/2.2.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWSContainer.java
Thu Sep  2 16:18:31 2010
@@ -85,10 +85,11 @@ public class JavaToWSContainer extends A
         } catch (Exception ex) {
             
             // Try to find an exception with a message on the stack
-            Throwable e = ex.getCause();
+            Throwable e = ex;
             while ((e.getMessage() == null || "".equals(e.getMessage())) && e.getCause()
!= null) {
                 e = e.getCause();
             }
+        
             err.println("Error: " + e.toString());
             err.println();
             if (isVerboseOn()) {



Mime
View raw message