vgritsenko 02/03/19 21:15:05 Modified: src/java/org/apache/cocoon/transformation TraxTransformer.java src/java/org/apache/cocoon/components/xslt XSLTProcessorImpl.java Log: minor cleanup Revision Changes Path 1.20 +3 -5 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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- TraxTransformer.java 9 Mar 2002 06:46:01 -0000 1.19 +++ TraxTransformer.java 20 Mar 2002 05:15:04 -0000 1.20 @@ -51,7 +51,6 @@ package org.apache.cocoon.transformation; import org.apache.avalon.framework.activity.Disposable; -import org.apache.avalon.framework.component.Component; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.Composable; @@ -61,7 +60,6 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.logger.Loggable; import org.apache.avalon.framework.parameters.Parameters; -import org.apache.cocoon.Constants; import org.apache.cocoon.ProcessingException; import org.apache.cocoon.caching.CacheValidity; import org.apache.cocoon.caching.Cacheable; @@ -157,7 +155,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.19 2002/03/09 06:46:01 vgritsenko Exp $ + * @version CVS $Id: TraxTransformer.java,v 1.20 2002/03/20 05:15:04 vgritsenko Exp $ */ public class TraxTransformer extends AbstractTransformer implements Transformer, Composable, Configurable, Cacheable, Disposable { @@ -227,7 +225,7 @@ child = conf.getChild("xslt-processor-role"); String xsltRole = child.getValue(XSLTProcessor.ROLE); - if (this.getLogger().isDebugEnabled()) { + if (this.getLogger().isDebugEnabled()) { this.getLogger().debug("Use parameters is " + this.useParameters + " for " + this); this.getLogger().debug("Use cookies is " + this.useCookies + " for " + this); this.getLogger().debug("Use browser capabilities is " + this.useBrowserCap + " for " + this); @@ -255,7 +253,6 @@ } this.browser = (Browser) manager.lookup(Browser.ROLE); - if (this.manager.hasComponent(Deli.ROLE)) { try { if (this.getLogger().isDebugEnabled()) { @@ -537,6 +534,7 @@ this.browser = null; this.xsltProcessor = null; this.deli = null; + this.manager = null; } public void recycle() { 1.17 +3 -2 xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java Index: XSLTProcessorImpl.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xslt/XSLTProcessorImpl.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- XSLTProcessorImpl.java 22 Feb 2002 07:00:15 -0000 1.16 +++ XSLTProcessorImpl.java 20 Mar 2002 05:15:05 -0000 1.17 @@ -117,7 +117,7 @@ * (<code>TransformerFactory.newInstance()</code>). * * @author <a href="mailto:[EMAIL PROTECTED]">Ovidiu Predescu</a> - * @version CVS $Id: XSLTProcessorImpl.java,v 1.16 2002/02/22 07:00:15 cziegeler Exp $ + * @version CVS $Id: XSLTProcessorImpl.java,v 1.17 2002/03/20 05:15:05 vgritsenko Exp $ * @version 1.0 * @since July 11, 2001 */ @@ -168,6 +168,8 @@ } this.manager = null; + this.tfactoryClass = null; + this.tfactory = null; } /** @@ -342,7 +344,6 @@ Templates templates = null; // only stylesheets with a last modification date are stored if (stylesheet.getLastModified() != 0) { - // Stored is an array of the template and the caching time if (store.containsKey(id)) { Object[] templateAndTime = (Object[])store.get(id);
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]