Author: jboynes
Date: Sat Nov 29 19:38:29 2014
New Revision: 1642468
URL: http://svn.apache.org/r1642468
Log:
Work around Xalan's newTransformer() method incorrectly returning null
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java?rev=1642468&r1=1642467&r2=1642468&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
Sat Nov 29 19:38:29 2014
@@ -121,8 +121,6 @@ public abstract class TransformSupport e
t.setURIResolver(uriResolver);
} catch (TransformerConfigurationException e) {
throw new JspTagException(e);
- } catch (RuntimeException e) {
- throw e;
}
return EVAL_BODY_BUFFERED;
}
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java?rev=1642468&r1=1642467&r2=1642468&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/XmlUtil.java
Sat Nov 29 19:38:29 2014
@@ -112,6 +112,8 @@ public class XmlUtil {
static Transformer newTransformer(Source source) throws
TransformerConfigurationException {
Transformer transformer = stf.newTransformer(source);
+ // Although newTansformer() is not meant to, Xalan returns null if the
XSLT is invalid
+ // rather than throwing TransformerConfigurationException. Trap that
here.
if (transformer == null) {
throw new TransformerConfigurationException("newTransformer
returned null");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
