You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2009/04/19 19:03:49 UTC
svn commit: r766489 -
/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeHandler.java
Author: mrglavas
Date: Sun Apr 19 17:03:49 2009
New Revision: 766489
URL: http://svn.apache.org/viewvc?rev=766489&view=rev
Log:
Pass the IOException from a resource error to the error reporter.
This should help applications in determining the actual source of
the error.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeHandler.java
Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeHandler.java
URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeHandler.java?rev=766489&r1=766488&r2=766489&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeHandler.java (original)
+++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/xinclude/XIncludeHandler.java Sun Apr 19 17:03:49 2009
@@ -1567,7 +1567,7 @@
catch (IOException e) {
reportResourceError(
"XMLResourceError",
- new Object[] { href, e.getMessage()});
+ new Object[] { href, e.getMessage()}, e);
return false;
}
}
@@ -1742,7 +1742,7 @@
// send a resource error, not a fatal error.
reportResourceError(
"XMLResourceError",
- new Object[] { href, e.getMessage()});
+ new Object[] { href, e.getMessage()}, e);
return false;
}
finally {
@@ -1798,7 +1798,7 @@
}
reportResourceError(
"TextResourceError",
- new Object[] { href, e.getMessage()});
+ new Object[] { href, e.getMessage()}, e);
return false;
}
finally {
@@ -1809,7 +1809,7 @@
catch (IOException e) {
reportResourceError(
"TextResourceError",
- new Object[] { href, e.getMessage()});
+ new Object[] { href, e.getMessage()}, e);
return false;
}
}
@@ -2368,11 +2368,15 @@
}
protected void reportResourceError(String key) {
- this.reportFatalError(key, null);
+ this.reportResourceError(key, null);
}
protected void reportResourceError(String key, Object[] args) {
- this.reportError(key, args, XMLErrorReporter.SEVERITY_WARNING);
+ this.reportResourceError(key, args, null);
+ }
+
+ protected void reportResourceError(String key, Object[] args, Exception exception) {
+ this.reportError(key, args, XMLErrorReporter.SEVERITY_WARNING, exception);
}
protected void reportFatalError(String key) {
@@ -2380,16 +2384,21 @@
}
protected void reportFatalError(String key, Object[] args) {
- this.reportError(key, args, XMLErrorReporter.SEVERITY_FATAL_ERROR);
+ this.reportFatalError(key, args, null);
+ }
+
+ protected void reportFatalError(String key, Object[] args, Exception exception) {
+ this.reportError(key, args, XMLErrorReporter.SEVERITY_FATAL_ERROR, exception);
}
- private void reportError(String key, Object[] args, short severity) {
+ private void reportError(String key, Object[] args, short severity, Exception exception) {
if (fErrorReporter != null) {
fErrorReporter.reportError(
XIncludeMessageFormatter.XINCLUDE_DOMAIN,
key,
args,
- severity);
+ severity,
+ exception);
}
// we won't worry about when error reporter is null, since there should always be
// at least the default error reporter
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org