You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/05/08 21:40:56 UTC
svn commit: r1831210 -
/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSource.java
Author: veithen
Date: Tue May 8 21:40:56 2018
New Revision: 1831210
URL: http://svn.apache.org/viewvc?rev=1831210&view=rev
Log:
Improve exception extraction in JAXBOMDataSource to fix build failures on recent Java 8 updates.
Modified:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSource.java
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSource.java?rev=1831210&r1=1831209&r2=1831210&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSource.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSource.java Tue May 8 21:40:56 2018
@@ -91,11 +91,13 @@ public class JAXBOMDataSource extends Ab
} catch (JAXBException ex) {
// Try to propagate the original exception if possible (to avoid unreadable stacktraces)
Throwable cause = ex.getCause();
- if (cause instanceof XMLStreamException) {
- throw (XMLStreamException)cause;
- } else {
- throw new XMLStreamException("Error marshalling JAXB object", ex);
+ while (cause != null) {
+ if (cause instanceof XMLStreamException) {
+ throw (XMLStreamException)cause;
+ }
+ cause = cause.getCause();
}
+ throw new XMLStreamException("Error marshalling JAXB object", ex);
}
}