vgritsenko 02/02/12 17:24:58 Modified: src/java/org/apache/cocoon/transformation TraxTransformer.java Log: code cleanup Revision Changes Path 1.13 +6 -22 xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java Index: TraxTransformer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/transformation/TraxTransformer.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- TraxTransformer.java 7 Feb 2002 07:41:24 -0000 1.12 +++ TraxTransformer.java 13 Feb 2002 01:24:58 -0000 1.13 @@ -161,7 +161,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> * @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a> * @author <a href="mailto:[EMAIL PROTECTED]">Mark H. Butler</a> - * @version CVS $Id: TraxTransformer.java,v 1.12 2002/02/07 07:41:24 cziegeler Exp $ + * @version CVS $Id: TraxTransformer.java,v 1.13 2002/02/13 01:24:58 vgritsenko Exp $ */ public class TraxTransformer extends AbstractTransformer implements Transformer, Composable, Configurable, Cacheable, Disposable { @@ -206,7 +206,7 @@ private Map objectModel; /** The XSLTProcessor */ - XSLTProcessor xsltProcessor; + private XSLTProcessor xsltProcessor; /** * Configure this transformer. @@ -299,7 +299,7 @@ this.par = par; this.objectModel = objectModel; this.inputSource = resolver.resolve(src); - xsltProcessor.setSourceResolver(resolver); + this.xsltProcessor.setSourceResolver(resolver); _useParameters = par.getParameterAsBoolean("use-request-parameters", this.useParameters); _useBrowserCap = par.getParameterAsBoolean("use-browser-capabilities-db", this.useBrowserCap); _useDeli = par.getParameterAsBoolean("use-deli", this.useDeli); @@ -559,25 +559,9 @@ public void recycle() { - //FIXME: Patch for Xalan2J, to stop transform threads if - // there is a failure in the pipeline. - /* VG: Xalan 2.2.0 does not have this class. - Does it stop now transform threads correctly? - try { - Class clazz = - Thread.currentThread().getContextClassLoader().loadClass("org.apache.xalan.stree.SourceTreeHandler"); - Class paramTypes[] = - new Class[]{ Exception.class }; - Object params[] = - new Object[] { new SAXException("Dummy Exception") }; - if(clazz.isInstance(transformerHandler)) { - Method method = clazz.getMethod("setExceptionThrown",paramTypes); - method.invoke(transformerHandler,params); - } - } catch (Exception e){ - getLogger().debug("Exception in recycle:", e); - } - */ + // Remove per-request resolver from the XSLT processor + this.xsltProcessor.setSourceResolver(null); + this.transformerHandler = null; this.objectModel = null; if (this.inputSource != null) {
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]