cziegeler 02/04/25 07:53:15 Modified: lib/core avalon-excalibur-20020424.jar src/java/org/apache/cocoon Cocoon.java src/java/org/apache/cocoon/environment AbstractEnvironment.java Log: Minor update Revision Changes Path 1.3 +137 -134 xml-cocoon2/lib/core/avalon-excalibur-20020424.jar <<Binary file>> 1.25 +1 -2 xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java Index: Cocoon.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Cocoon.java 25 Apr 2002 09:30:48 -0000 1.24 +++ Cocoon.java 25 Apr 2002 14:53:15 -0000 1.25 @@ -99,7 +99,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a> (Apache Software Foundation, Exoffice Technologies) * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a> * @author <a href="mailto:[EMAIL PROTECTED]">Leo Sutic</a> - * @version CVS $Id: Cocoon.java,v 1.24 2002/04/25 09:30:48 cziegeler Exp $ + * @version CVS $Id: Cocoon.java,v 1.25 2002/04/25 14:53:15 cziegeler Exp $ */ public class Cocoon extends AbstractLoggable @@ -601,7 +601,6 @@ if (this.getLogger().isDebugEnabled()) { --activeRequestCount; } - environment.setComponents( null, null ); } } 1.17 +3 -2 xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java Index: AbstractEnvironment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- AbstractEnvironment.java 25 Apr 2002 09:30:48 -0000 1.16 +++ AbstractEnvironment.java 25 Apr 2002 14:53:15 -0000 1.17 @@ -73,7 +73,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Id: AbstractEnvironment.java,v 1.16 2002/04/25 09:30:48 cziegeler Exp $ + * @version CVS $Id: AbstractEnvironment.java,v 1.17 2002/04/25 14:53:15 cziegeler Exp $ */ public abstract class AbstractEnvironment extends AbstractLoggable implements Environment { @@ -453,7 +453,8 @@ * Releases a resolved resource */ public void release( final org.apache.excalibur.source.Source source ) { - this.sourceResolver.release( source ); + if ( null != source ) + this.sourceResolver.release( source ); } /**
---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]