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 2013/11/27 18:34:26 UTC
svn commit: r1546131 - in /cxf/branches/2.7.x-fixes:
api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Author: dkulp
Date: Wed Nov 27 17:34:26 2013
New Revision: 1546131
URL: http://svn.apache.org/r1546131
Log:
Merged revisions 1546067 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1546067 | dkulp | 2013-11-27 10:19:37 -0500 (Wed, 27 Nov 2013) | 2 lines
Make sure we use the constructor that takes the message to work around an issue in geromino-specs stax-api
........
Modified:
cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1546131&r1=1546130&r2=1546131&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Wed Nov 27 17:34:26 2013
@@ -597,7 +597,7 @@ public final class StaxUtils {
reader.parse(((SAXSource)source).getInputSource());
return;
} catch (Exception e) {
- throw new XMLStreamException(e);
+ throw new XMLStreamException(e.getMessage(), e);
}
} else if (ss.getInputSource() == null) {
//nothing to copy, just return
@@ -1871,14 +1871,14 @@ public final class StaxUtils {
if (allowInsecureParser) {
LOG.warning("INSTANCE_NOT_XMLSTREAMREADER2");
} else {
- throw new XMLStreamException(cce);
+ throw new XMLStreamException(cce.getMessage(), cce);
}
} catch (IllegalArgumentException cce) {
//not a property supported by this version of woodstox
if (allowInsecureParser) {
LOG.log(Level.WARNING, "SECURE_PROPERTY_NOT_SUPPORTED", cce.getMessage());
} else {
- throw new XMLStreamException(cce);
+ throw new XMLStreamException(cce.getMessage(), cce);
}
}
return reader;
Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1546131&r1=1546130&r2=1546131&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java (original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java Wed Nov 27 17:34:26 2013
@@ -250,7 +250,7 @@ public class XMLStreamDataReader impleme
try {
schema.newValidator().validate(new DOMSource(newElement));
} catch (SAXException e) {
- throw new XMLStreamException(e);
+ throw new XMLStreamException(e.getMessage(), e);
}
}
return rootElement;