mmidy 02/01/28 14:18:16
Modified: java/src/org/apache/xalan/transformer TransformerImpl.java
Log:
Bug 5872. We were using a constructor of TranformerException without the locator
information. Changed to code to use a locator if info is available.
Revision Changes Path
1.120 +13 -9
xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- TransformerImpl.java 28 Jan 2002 19:07:43 -0000 1.119
+++ TransformerImpl.java 28 Jan 2002 22:18:16 -0000 1.120
@@ -665,9 +665,8 @@
}
else if (e instanceof org.apache.xml.utils.WrappedRuntimeException)
{
- m_errorHandler.fatalError(
- new javax.xml.transform.TransformerException(
- ((org.apache.xml.utils.WrappedRuntimeException) e).getException()));
+ fatalError(
+ ((org.apache.xml.utils.WrappedRuntimeException) e).getException());
}
else
{
@@ -690,17 +689,13 @@
((org.apache.xml.utils.WrappedRuntimeException) throwable).getException();
}
- m_errorHandler.fatalError(new TransformerException(wre.getException()));
+ fatalError(throwable);
}
// Patch attributed to David Eisenberg <[EMAIL PROTECTED]>
catch (org.xml.sax.SAXParseException spe)
{
- String msg = spe.getMessage();
- SAXSourceLocator loc = new SAXSourceLocator(spe);
-
- //m_errorHandler.fatalError(new TransformerException( msg, loc ));
- m_errorHandler.fatalError(new TransformerException(spe));
+ fatalError(spe);
}
catch (org.xml.sax.SAXException se)
{
@@ -713,6 +708,15 @@
// This looks to be redundent to the one done in TransformNode.
reset();
}
+ }
+
+ private void fatalError(Throwable throwable) throws TransformerException
+ {
+ if (throwable instanceof org.xml.sax.SAXParseException)
+ m_errorHandler.fatalError(new TransformerException(throwable.getMessage(),new
SAXSourceLocator((org.xml.sax.SAXParseException)throwable)));
+ else
+ m_errorHandler.fatalError(new TransformerException(throwable));
+
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
