You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/10/13 11:50:04 UTC
svn commit: r1182747 - in /cxf/branches/2.4.x-fixes: ./
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/
rt/core/src/main/java/org/apache/cxf/interceptor/
systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/deta...
Author: ningjiang
Date: Thu Oct 13 09:50:04 2011
New Revision: 1182747
URL: http://svn.apache.org/viewvc?rev=1182747&view=rev
Log:
Merged revisions 1182717 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1182717 | ningjiang | 2011-10-13 16:32:10 +0800 (Thu, 13 Oct 2011) | 1 line
CXF-3736 clean up the codes
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 09:50:04 2011
@@ -1 +1 @@
-/cxf/trunk:1179846,1180649,1180653,1181611-1181612,1182637,1182715-1182716
+/cxf/trunk:1179846,1180649,1180653,1181611-1181612,1182637,1182715-1182717
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java?rev=1182747&r1=1182746&r2=1182747&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java Thu Oct 13 09:50:04 2011
@@ -79,13 +79,13 @@ public abstract class AbstractSoapInterc
StringBuilder sb = new StringBuilder();
Throwable throwable = fault.getCause();
while (throwable != null) {
- for (StackTraceElement ste : fault.getCause().getStackTrace()) {
+ for (StackTraceElement ste : throwable.getStackTrace()) {
sb.append(ste.getClassName() + "!" + ste.getMethodName() + "!" + ste.getFileName() + "!"
+ ste.getLineNumber() + "\n");
}
throwable = throwable.getCause();
if (throwable != null) {
- sb.append("Caused by:" + throwable.getClass() + ":" + throwable.getMessage() + " ");
+ sb.append("Caused by: " + throwable.getClass() + " : " + throwable.getMessage() + "\n");
}
}
Element detail = fault.getDetail();
Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java?rev=1182747&r1=1182746&r2=1182747&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java Thu Oct 13 09:50:04 2011
@@ -243,6 +243,11 @@ public class ClientFaultConverter extend
StringTokenizer st = new StringTokenizer(ss, "\n");
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.
+ break;
+ }
StringTokenizer stInner = new StringTokenizer(oneLine, "!");
StackTraceElement ste = new StackTraceElement(stInner.nextToken(), stInner.nextToken(),
stInner.nextToken(), Integer.parseInt(stInner.nextToken()));
Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java?rev=1182747&r1=1182746&r2=1182747&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java (original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/Soap11ClientServerTest.java Thu Oct 13 09:50:04 2011
@@ -24,14 +24,12 @@ import java.net.MalformedURLException;
import javax.xml.ws.soap.SOAPFaultException;
-
import org.apache.cxf.greeter_control.Greeter;
import org.apache.cxf.greeter_control.GreeterService;
import org.apache.cxf.greeter_control.PingMeFault;
import org.apache.cxf.greeter_control.types.FaultDetail;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-
import org.junit.BeforeClass;
import org.junit.Test;
@@ -55,15 +53,6 @@ public class Soap11ClientServerTest exte
StackTraceElement[] elements = ex.getCause().getStackTrace();
assertEquals("org.apache.cxf.systest.soapfault.details.GreeterImpl11",
elements[0].getClassName());
- //ex.printStackTrace();
- boolean findNPE = false;
- for (StackTraceElement element : elements) {
- if (element.getClassName().indexOf("java.lang.NullPointerException") > 0) {
- findNPE = true;
- break;
- }
- }
- assertTrue("Cannot find the Cause of NPE", findNPE);
}
}