Author: mrglavas
Date: Wed Oct 27 02:56:05 2010
New Revision: 1027806
URL: http://svn.apache.org/viewvc?rev=1027806&view=rev
Log:
Fixing a bug on the error handling path for StAX input. XMLStreamReaders cannot
directly throw an IOException, so we need to check before re-throwing the
exception whether it wraps an IOException and if it does possibly only report a
warning.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=1027806&r1=1027805&r2=1027806&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Wed Oct 27 02:56:05 2010
@@ -2534,9 +2534,15 @@ public class XSDHandler {
return getSchemaDocument0(key, schemaId, schemaElement);
}
catch (XMLStreamException e) {
- StAXLocationWrapper slw = new StAXLocationWrapper();
- slw.setLocation(e.getLocation());
- throw new XMLParseException(slw, e.getMessage(), e);
+ Throwable t = e.getNestedException();
+ if (t instanceof IOException) {
+ exception = (IOException) t;
+ }
+ else {
+ StAXLocationWrapper slw = new StAXLocationWrapper();
+ slw.setLocation(e.getLocation());
+ throw new XMLParseException(slw, e.getMessage(), e);
+ }
}
catch (IOException e) {
exception = e;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
