cziegeler 2002/12/04 01:56:25
Modified: src/java/org/apache/cocoon Tag: cocoon_2_0_3_branch
Cocoon.java
src/java/org/apache/cocoon/components Tag:
cocoon_2_0_3_branch CocoonComponentManager.java
src/java/org/apache/cocoon/components/source Tag:
cocoon_2_0_3_branch SitemapSource.java
Log:
Add cleaning up of environment description
Revision Changes Path
No revision
No revision
1.22.2.6 +2 -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.22.2.5
retrieving revision 1.22.2.6
diff -u -r1.22.2.5 -r1.22.2.6
--- Cocoon.java 20 Nov 2002 11:21:49 -0000 1.22.2.5
+++ Cocoon.java 4 Dec 2002 09:56:24 -0000 1.22.2.6
@@ -587,7 +587,7 @@
}
}
} finally {
- CocoonComponentManager.endProcessing(key);
+ CocoonComponentManager.endProcessing(environment, key);
if (this.getLogger().isDebugEnabled()) {
--activeRequestCount;
}
No revision
No revision
1.13.2.8 +15 -6
xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.13.2.7
retrieving revision 1.13.2.8
diff -u -r1.13.2.7 -r1.13.2.8
--- CocoonComponentManager.java 2 Dec 2002 08:37:42 -0000 1.13.2.7
+++ CocoonComponentManager.java 4 Dec 2002 09:56:25 -0000 1.13.2.8
@@ -73,8 +73,11 @@
/**
* Cocoon Component Manager.
- * This manager extends the <code>ExcaliburComponentManager</code>
- * by a special lifecycle handling for a RequestLifecycleComponent
+ * This manager extends the {@link ExcaliburComponentManager}
+ * by a special lifecycle handling for a {@link RequestLifecycleComponent}
+ * WARNING: This is a "private" Cocoon core class - do NOT use this class
+ * directly - and do not assume that a {@link ComponentManager} you get
+ * via the compose() method is an instance of CocoonComponentManager.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @version CVS $Id$
@@ -119,8 +122,8 @@
* This hook must be called by the sitemap each time a sitemap is entered
*/
public static void enterEnvironment(Environment env,
- Map objectModel,
- Processor processor) {
+ Map objectModel,
+ Processor processor) {
if (environmentStack.get() == null) {
environmentStack.set(new EnvironmentStack());
}
@@ -168,9 +171,10 @@
* @param key A unique key within this thread return by
* {@link startProcessing(Environment)}.
*/
- public static void endProcessing(Object key) {
+ public static void endProcessing(Environment env, Object key) {
EnvironmentDescription desc = (EnvironmentDescription)key;
desc.release();
+ env.getObjectModel().remove(PROCESS_KEY);
}
/**
@@ -373,6 +377,11 @@
}
}
}
+ this.requestLifecycleComponents.clear();
+ this.autoreleaseComponents.clear();
+ this.sitemapConfigurations.clear();
+ this.environment = null;
+ this.objectModel = null;
}
No revision
No revision
1.9.2.6 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/source/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/SitemapSource.java,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- SitemapSource.java 20 Nov 2002 14:53:22 -0000 1.9.2.5
+++ SitemapSource.java 4 Dec 2002 09:56:25 -0000 1.9.2.6
@@ -401,7 +401,7 @@
if (this.eventPipeline != null) this.manager.release(this.eventPipeline);
if (this.pipeline != null) this.manager.release(this.pipeline);
if (this.processKey != null) {
- CocoonComponentManager.endProcessing(this.processKey);
+ CocoonComponentManager.endProcessing(this.environment, this.processKey);
this.processKey = null;
}
this.eventPipeline = null;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
