cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1546067 - in /cxf/trunk/core/src/main/java/org/apache/cxf: databinding/source/XMLStreamDataReader.java staxutils/StaxUtils.java
Date Wed, 27 Nov 2013 15:19:38 GMT
Author: dkulp
Date: Wed Nov 27 15:19:37 2013
New Revision: 1546067

URL: http://svn.apache.org/r1546067
Log:
Make sure we use the constructor that takes the message to work around an issue in geromino-specs
stax-api

Modified:
    cxf/trunk/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java

Modified: cxf/trunk/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1546067&r1=1546066&r2=1546067&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Wed Nov 27 15:19:37 2013
@@ -262,7 +262,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;        

Modified: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1546067&r1=1546066&r2=1546067&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Wed Nov 27 15:19:37
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
@@ -1869,14 +1869,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;



Mime
View raw message