svn commit: r1298998 - /cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java

[dk...@apache.org]

Author: dkulp
Date: Fri Mar  9 19:32:02 2012
New Revision: 1298998

URL: http://svn.apache.org/viewvc?rev=1298998&view=rev
Log:
[CXF-4169] make nested exception causes available at the client
Patch from Stefan Wachter applied

Modified:
    cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java

Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=1298998&r1=1298997&r2=1298998&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Fri Mar  9 19:32:02 2012
@@ -233,6 +233,7 @@ public class ClientFaultConverter extend
     }
     
     private void setStackTrace(Fault fault, Message msg) {
+        Throwable cause = null;
         Map<String, String> ns = new HashMap<String, String>();
         XPathUtils xu = new XPathUtils(ns);
         ns.put("s", Fault.STACKTRACE_NAMESPACE);
@@ -244,23 +245,50 @@ public class ClientFaultConverter extend
             while (st.hasMoreTokens()) {
                 String oneLine = st.nextToken();
                 if (oneLine.startsWith("Caused by:")) {
-                    // need to skip this part of message,
-                    // as we can't create the cause exception instance directly. 
+                    cause = getCause(st, oneLine);
                     break;
                 }
-                StringTokenizer stInner = new StringTokenizer(oneLine, "!");
-                StackTraceElement ste = new StackTraceElement(stInner.nextToken(), stInner.nextToken(),
-                        stInner.nextToken(), Integer.parseInt(stInner.nextToken()));
-                stackTraceList.add(ste);
+                stackTraceList.add(parseStackTrackLine(oneLine));
             }
-            if (stackTraceList.size() > 0) {
-                StackTraceElement[] stackTraceElement = new StackTraceElement[stackTraceList.size()];
+            if (stackTraceList.size() > 0 || cause != null) {
                 Exception e = msg.getContent(Exception.class);
-                e.setStackTrace(stackTraceList.toArray(stackTraceElement));
+                if (!stackTraceList.isEmpty()) {
+                    StackTraceElement[] stackTraceElement = new StackTraceElement[stackTraceList.size()];
+                    e.setStackTrace(stackTraceList.toArray(stackTraceElement));
+                }
+                if (cause != null) {
+                    e.initCause(cause);
+                }
             }
         }
 
     }
+
+    // recursively parse the causes and instantiate corresponding throwables
+    private Throwable getCause(StringTokenizer st, String firstLine) {
+        // The actual exception class of the cause might be unavailable at the
+        // client -> use a standard throwable to represent the cause.
+        Throwable res = new Throwable(firstLine.substring(firstLine.indexOf(":") + 2));
+        List<StackTraceElement> stackTraceList = new ArrayList<StackTraceElement>();
+        while (st.hasMoreTokens()) {
+            String oneLine = st.nextToken();
+            if (oneLine.startsWith("Caused by:")) {
+                Throwable nestedCause = getCause(st, oneLine);
+                res.initCause(nestedCause);
+                break;
+            }
+            stackTraceList.add(parseStackTrackLine(oneLine));
+        }
+        StackTraceElement[] stackTraceElement = new StackTraceElement[stackTraceList.size()];
+        res.setStackTrace(stackTraceList.toArray(stackTraceElement));
+        return res;
+    }
+    
+    private static StackTraceElement parseStackTrackLine(String oneLine) {
+        StringTokenizer stInner = new StringTokenizer(oneLine, "!");
+        return new StackTraceElement(stInner.nextToken(), stInner.nextToken(),
+                stInner.nextToken(), Integer.parseInt(stInner.nextToken()));
+    }
     
     private Class<?> getPrimitiveClass(Class<?> cls) {
         if (cls.isPrimitive()) {