Author: cziegeler
Date: Wed Mar 16 12:04:10 2005
New Revision: 157796
URL: http://svn.apache.org/viewcvs?view=rev&rev=157796
Log:
Dispose component locator
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java?view=diff&r1=157795&r2=157796
==============================================================================
---
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
(original)
+++
cocoon/trunk/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Wed Mar 16 12:04:10 2005
@@ -60,6 +60,9 @@
private static final String COMMA_SPLIT_REGEXP = "[\\s]*,[\\s]*";
private static final String EQUALS_SPLIT_REGEXP = "[\\s]*=[\\s]*";
+ /** Optional application container */
+ private ComponentLocator applicationContainer;
+
/**
* Build a component manager with the contents of the
<map:components> element of
* the tree.
@@ -120,7 +123,8 @@
ContainerUtil.service(cl, newManager);
ContainerUtil.configure(cl, appContainer);
ContainerUtil.initialize(cl);
-
+ this.applicationContainer = cl;
+
newManager = new ComponentManager(newManager, cl);
}
} finally {
@@ -176,6 +180,15 @@
this.viewsNode = null;
this.isBuildingView = false;
this.isBuildingErrorHandler = false;
+ }
+
+ /**
+ * @see org.apache.avalon.framework.activity.Disposable#dispose()
+ */
+ public void dispose() {
+ ContainerUtil.dispose(this.applicationContainer);
+ this.applicationContainer = null;
+ super.dispose();
}
/**
