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/12 14:57:19 UTC
svn commit: r314870 -
/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
Author: cziegeler
Date: Wed Oct 12 05:57:16 2005
New Revision: 314870
URL: http://svn.apache.org/viewcvs?rev=314870&view=rev
Log:
Fix possible ClassCastException in DefaultVariableResolverFactory
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java?rev=314870&r1=314869&r2=314870&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/components/variables/DefaultVariableResolverFactory.java Wed Oct 12 05:57:16 2005
@@ -15,8 +15,8 @@
*/
package org.apache.cocoon.components.variables;
-import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.Component;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -65,9 +65,7 @@
}
public void release(VariableResolver resolver) {
- if ( resolver != null ) {
- ((Disposable)resolver).dispose();
- }
+ ContainerUtil.dispose(resolver);
}
/**