You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jb...@apache.org on 2006/02/09 13:37:38 UTC
svn commit: r376276 - in /cocoon: branches/BRANCH_2_1_X/status.xml
trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
Author: jbq
Date: Thu Feb 9 04:37:37 2006
New Revision: 376276
URL: http://svn.apache.org/viewcvs?rev=376276&view=rev
Log:
Fix COCOON-1344: call dispose() on every DatatypeBuilder if needed
Modified:
cocoon/branches/BRANCH_2_1_X/status.xml
cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=376276&r1=376275&r2=376276&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Feb 9 04:37:37 2006
@@ -180,6 +180,9 @@
<release version="@version@" date="@date@">
-->
<release version="2.1.9" date="TBD">
+ <action dev="JBQ" type="fix" fixes-bug="COCOON-1344" due-to="Jonas Ekstedt" due-to-email="ekstedt@ibg.uu.se">
+ CForms: call dispose() on every DatatypeBuilder if needed
+ </action>
<action dev="JBQ" type="add" due-to="Philippe Gassmann" due-to-email="phil@anyware-tech.com">
CForms: Java event listeners can now implement Serviceable to get a ServiceManager
</action>
Modified: cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java?rev=376276&r1=376275&r2=376276&view=diff
==============================================================================
--- cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java (original)
+++ cocoon/trunk/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java Thu Feb 9 04:37:37 2006
@@ -15,6 +15,7 @@
*/
package org.apache.cocoon.forms.datatype.typeimpl;
+import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -40,7 +41,7 @@
* will derive from this class.
* @version $Id$
*/
-public abstract class AbstractDatatypeBuilder extends AbstractLogEnabled implements DatatypeBuilder, Serviceable, Configurable, Contextualizable {
+public abstract class AbstractDatatypeBuilder extends AbstractLogEnabled implements DatatypeBuilder, Serviceable, Configurable, Contextualizable, Disposable {
protected ServiceManager serviceManager;
private SimpleServiceSelector convertorBuilders;
private String defaultConvertorHint;
@@ -81,6 +82,10 @@
} catch (Exception e) {
throw new ConfigurationException("Error create plain convertor.", e);
}
+ }
+
+ public void dispose() {
+ convertorBuilders.dispose();
}
public void buildConvertor(Element datatypeEl, AbstractDatatype datatype) throws Exception {