You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by oz...@apache.org on 2005/02/05 01:33:33 UTC
svn commit: r151450 - in
jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2:
NestedSAXException.java SAXHandler.java
Author: ozeigermann
Date: Fri Feb 4 16:33:31 2005
New Revision: 151450
URL: http://svn.apache.org/viewcvs?view=rev&rev=151450
Log:
Fixed 1.4 incompatibility
Modified:
jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/NestedSAXException.java
jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/SAXHandler.java
Modified: jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/NestedSAXException.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/NestedSAXException.java?view=diff&r1=151449&r2=151450
==============================================================================
--- jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/NestedSAXException.java (original)
+++ jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/NestedSAXException.java Fri Feb 4 16:33:31 2005
@@ -37,6 +37,7 @@
}
public NestedSAXException(Throwable t) {
+ super(t.getMessage());
cause = t;
}
Modified: jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/SAXHandler.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/SAXHandler.java?view=diff&r1=151449&r2=151450
==============================================================================
--- jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/SAXHandler.java (original)
+++ jakarta/commons/proper/digester/branches/digester2/src/java/org/apache/commons/digester2/SAXHandler.java Fri Feb 4 16:33:31 2005
@@ -1265,15 +1265,20 @@
*
*/
public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException, IOException {
+// throws SAXException, IOException {
+ throws SAXException {
if (saxLog.isDebugEnabled()) {
saxLog.debug("resolveEntity('" + publicId + "', '" + systemId + "')");
}
if (entityResolver != null) {
- // the user has specified their own EntityResolver, so we just
- // forward the call to that object:
- return entityResolver.resolveEntity(publicId, systemId);
+ try {
+ // the user has specified their own EntityResolver, so we just
+ // forward the call to that object:
+ return entityResolver.resolveEntity(publicId, systemId);
+ } catch (IOException e) {
+ throw new NestedSAXException(e);
+ }
}
// TODO: fix this. We can't assume that every external entity
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org