You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/11/30 03:37:29 UTC
svn commit: r1208218 - in /cxf/branches/2.3.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Author: dkulp
Date: Wed Nov 30 02:37:28 2011
New Revision: 1208218
URL: http://svn.apache.org/viewvc?rev=1208218&view=rev
Log:
Merged revisions 1208203 via svnmerge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1208203 | dkulp | 2011-11-29 20:37:01 -0500 (Tue, 29 Nov 2011) | 10 lines
Merged revisions 1208098 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1208098 | dkulp | 2011-11-29 16:57:33 -0500 (Tue, 29 Nov 2011) | 2 lines
[CXF-3934] Remove the fillInStackTrace calls that is causing stack
traces to be wiped out and become irrelevant.
........
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=1208218&r1=1208217&r2=1208218&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java (original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java Wed Nov 30 02:37:28 2011
@@ -248,7 +248,7 @@ public final class JAXBEncoderDecoder {
writeObject(marshaller, source, mObj);
}
} catch (Fault ex) {
- throw (Fault)ex.fillInStackTrace();
+ throw ex;
} catch (Exception ex) {
if (ex instanceof javax.xml.bind.MarshalException) {
javax.xml.bind.MarshalException marshalEx = (javax.xml.bind.MarshalException)ex;
@@ -979,7 +979,6 @@ public final class JAXBEncoderDecoder {
}
return ret;
} catch (Fault ex) {
- ex.fillInStackTrace();
throw ex;
} catch (Exception ex) {
if (ex instanceof javax.xml.bind.UnmarshalException) {
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java?rev=1208218&r1=1208217&r2=1208218&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java Wed Nov 30 02:37:28 2011
@@ -105,7 +105,7 @@ public class JaxWsClientProxy extends or
try {
return method.invoke(this, params);
} catch (InvocationTargetException e) {
- throw e.fillInStackTrace().getCause();
+ throw e.getCause();
}
}
@@ -124,11 +124,11 @@ public class JaxWsClientProxy extends or
result = invokeSync(method, oi, params);
}
} catch (WebServiceException wex) {
- throw wex.fillInStackTrace();
+ throw wex;
} catch (Exception ex) {
for (Class<?> excls : method.getExceptionTypes()) {
if (excls.isInstance(ex)) {
- throw ex.fillInStackTrace();
+ throw ex;
}
}
if (ex instanceof Fault && ex.getCause() instanceof IOException) {