You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/10 11:59:59 UTC
svn commit: r312595 -
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Author: cziegeler
Date: Mon Oct 10 02:59:56 2005
New Revision: 312595
URL: http://svn.apache.org/viewcvs?rev=312595&view=rev
Log:
First dispose old tree processor than create new one
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java?rev=312595&r1=312594&r2=312595&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Mon Oct 10 02:59:56 2005
@@ -312,6 +312,11 @@
long startTime = System.currentTimeMillis();
+ // Dispose the old processor, if any
+ if (this.concreteProcessor != null) {
+ this.concreteProcessor.markForDisposal();
+ }
+
// Get a builder
TreeBuilder builder = (TreeBuilder)this.builderSelector.select("sitemap");
ConcreteTreeProcessor newProcessor = new ConcreteTreeProcessor(this);
@@ -341,15 +346,8 @@
}
// Switch to the new processor (ensure it's never temporarily null)
- ConcreteTreeProcessor oldProcessor = this.concreteProcessor;
-
this.concreteProcessor = newProcessor;
this.lastModified = newLastModified;
-
- // Dispose the old processor, if any
- if (oldProcessor != null) {
- oldProcessor.markForDisposal();
- }
}
/* (non-Javadoc)