You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2008/12/18 13:35:58 UTC
svn commit: r727707 - in
/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib:
./ definition/
Author: apetrelli
Date: Thu Dec 18 04:35:57 2008
New Revision: 727707
URL: http://svn.apache.org/viewvc?rev=727707&view=rev
Log:
TILES-339
Applied patch posted by Zach Bailey.
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java Thu Dec 18 04:35:57 2008
@@ -21,12 +21,11 @@
package org.apache.tiles.jsp.taglib;
-import org.apache.tiles.jsp.taglib.definition.DefinitionTagParent;
-
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.tiles.jsp.taglib.definition.DefinitionTagParent;
+
/**
* <p><strong>Adds an attribute in enclosing attribute container tag.</strong></p>
* <p>Enclosing attribute container tag can be :
@@ -56,7 +55,7 @@
*
* @version $Rev$ $Date$
*/
-public class AddAttributeTag extends BodyTagSupport implements DefinitionTagParent {
+public class AddAttributeTag extends TilesBodyTag implements DefinitionTagParent {
/**
* The role to check. If the user is in the specified role, the tag is taken
@@ -152,11 +151,10 @@
this.type = type;
}
- /**
- * Release all allocated resources.
- */
+ /** {@inheritDoc} */
@Override
- public void release() {
+ protected void reset() {
+ super.reset();
role = null;
value = null;
type = null;
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java Thu Dec 18 04:35:57 2008
@@ -67,15 +67,6 @@
}
/**
- * Release the state of this put list by
- * clearing the contents of the list.
- */
- public void release() {
- super.setValue(null);
- super.release();
- }
-
- /**
* Process nested ≶addAttribute> tag.
* <p/>
* Places the value of the nested tag within the
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java Thu Dec 18 04:35:57 2008
@@ -20,6 +20,12 @@
*/
package org.apache.tiles.jsp.taglib;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.jsp.PageContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
@@ -28,18 +34,12 @@
import org.apache.tiles.TilesException;
import org.apache.tiles.jsp.context.JspUtil;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Support for Scoped tags.
*
* @version $Rev$ $Date$
*/
-public abstract class AttributeTagSupport extends TagSupport {
+public abstract class AttributeTagSupport extends TilesTag {
/**
* The logging object.
@@ -122,7 +122,9 @@
}
/** {@inheritDoc} */
- public void release() {
+ @Override
+ protected void reset() {
+ super.reset();
scopeName = null;
scope = PageContext.PAGE_SCOPE;
ignore = false;
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java Thu Dec 18 04:35:57 2008
@@ -72,6 +72,13 @@
this.toName = toName;
}
+ /** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
+ this.toName = null;
+ }
+
/**
* Expose the requested property from attribute context.
*
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java Thu Dec 18 04:35:57 2008
@@ -93,6 +93,15 @@
/** {@inheritDoc} */
@Override
+ protected void reset() {
+ super.reset();
+ this.name = null;
+ this.value = null;
+ this.attribute = null;
+ }
+
+ /** {@inheritDoc} */
+ @Override
public int doStartTag() throws TilesJspException {
if (value == null && name == null) {
throw new TilesJspException(
@@ -102,14 +111,6 @@
}
/** {@inheritDoc} */
- public void release() {
- super.release();
- this.name = null;
- this.value = null;
- this.attribute = null;
- }
-
- /** {@inheritDoc} */
protected void render() throws TilesJspException, IOException {
HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java Thu Dec 18 04:35:57 2008
@@ -64,6 +64,13 @@
/** {@inheritDoc} */
@Override
+ protected void reset() {
+ super.reset();
+ this.template = null;
+ }
+
+ /** {@inheritDoc} */
+ @Override
protected void render() throws IOException {
attributeContext.setTemplate(template);
attributeContext.setPreparer(preparer);
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java Thu Dec 18 04:35:57 2008
@@ -123,11 +123,10 @@
this.cascade = cascade;
}
- /**
- * Release all allocated resources.
- */
- public void release() {
- super.release();
+ /** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
name = null;
cascade = false;
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java Thu Dec 18 04:35:57 2008
@@ -100,14 +100,11 @@
return (SKIP_BODY);
}
- /**
- * Release the state of this put list by
- * clearing the contents of the list.
- */
- public void release() {
+ /** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
inherit = false;
- super.setValue(null);
- super.release();
}
/**
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java Thu Dec 18 04:35:57 2008
@@ -20,6 +20,11 @@
*/
package org.apache.tiles.jsp.taglib;
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.PageContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
@@ -28,12 +33,6 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.jsp.context.JspUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-import java.io.IOException;
-
/**
* <p>
* Support for all tags which render (an attribute, a template, or definition).
@@ -50,7 +49,7 @@
* @since Tiles 2.0
* @version $Rev$ $Date$
*/
-public abstract class RenderTagSupport extends BodyTagSupport implements
+public abstract class RenderTagSupport extends TilesBodyTag implements
PutAttributeTagParent, PutListAttributeTagParent {
/**
@@ -172,9 +171,10 @@
this.ignore = ignore;
}
-
/** {@inheritDoc} */
- public void release() {
+ @Override
+ protected void reset() {
+ super.reset();
preparer = null;
flush = false;
ignore = false;
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java Thu Dec 18 04:35:57 2008
@@ -20,12 +20,12 @@
*/
package org.apache.tiles.jsp.taglib;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Base tag for the tiles tags which provides standard support for security.
@@ -34,7 +34,7 @@
* @version $Rev$ $Date$
* @deprecated Use {@link AddAttributeTag} and {@link PutAttributeTag} directly.
*/
-public abstract class RoleSecurityTagSupport extends BodyTagSupport {
+public abstract class RoleSecurityTagSupport extends TilesBodyTag {
/**
* The log instance for this tag.
@@ -68,6 +68,13 @@
}
/** {@inheritDoc} */
+ @Override
+ protected void reset() {
+ super.reset();
+ this.role = null;
+ }
+
+ /** {@inheritDoc} */
public int doEndTag() throws TilesJspException {
try {
if (isAccessAllowed()) {
@@ -82,14 +89,6 @@
return EVAL_PAGE;
}
-
-
- /** {@inheritDoc} */
- public void release() {
- super.release();
- this.role = null;
- }
-
/**
* Executes the tag. It is called inside {@link #doEndTag()}.
*
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java Thu Dec 18 04:35:57 2008
@@ -41,15 +41,6 @@
private String classname = null;
/**
- * Release all allocated resources.
- */
- public void release() {
- super.release();
- classname = null;
- id = null;
- }
-
- /**
* Get class name.
*
* @return class name
@@ -68,6 +59,12 @@
this.classname = name;
}
+ /** {@inheritDoc} */
+ protected void reset() {
+ super.reset();
+ classname = null;
+ id = null;
+ }
/**
* Expose the requested attribute from attribute context.
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java Thu Dec 18 04:35:57 2008
@@ -30,10 +30,9 @@
import org.apache.tiles.jsp.taglib.PutListAttributeTag;
import org.apache.tiles.jsp.taglib.PutListAttributeTagParent;
import org.apache.tiles.jsp.taglib.TilesJspException;
+import org.apache.tiles.jsp.taglib.TilesTag;
import org.apache.tiles.mgmt.MutableTilesContainer;
-import javax.servlet.jsp.tagext.TagSupport;
-
/**
* This is the tag handler for <tiles:definition>, which creates a custom
* definition. If the configured container is a {@link MutableTilesContainer},
@@ -41,7 +40,7 @@
*
* @version $Rev$ $Date$
*/
-public class DefinitionTag extends TagSupport implements PutAttributeTagParent,
+public class DefinitionTag extends TilesTag implements PutAttributeTagParent,
PutListAttributeTagParent {
@@ -172,8 +171,9 @@
}
/** {@inheritDoc} */
- public void release() {
- super.release();
+ @Override
+ protected void reset() {
+ super.reset();
name = null;
template = null;
extend = null;
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java Thu Dec 18 04:35:57 2008
@@ -21,15 +21,14 @@
package org.apache.tiles.jsp.taglib.definition;
import org.apache.tiles.access.TilesAccess;
-
-import javax.servlet.jsp.tagext.TagSupport;
+import org.apache.tiles.jsp.taglib.TilesTag;
/**
* Destroys the accessible container.
*
* @version $Rev$ $Date$
*/
-public class DestroyContainerTag extends TagSupport {
+public class DestroyContainerTag extends TilesTag {
/**
* The key of the container to destroy.
@@ -58,6 +57,13 @@
/** {@inheritDoc} */
@Override
+ protected void reset() {
+ super.reset();
+ this.containerKey = null;
+ }
+
+ /** {@inheritDoc} */
+ @Override
public int doEndTag() {
TilesAccess.setContainer(pageContext.getServletContext(), null,
containerKey);
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java Thu Dec 18 04:35:57 2008
@@ -22,6 +22,21 @@
package org.apache.tiles.jsp.taglib.definition;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
@@ -32,29 +47,15 @@
import org.apache.tiles.factory.TilesContainerFactory;
import org.apache.tiles.jsp.taglib.PutAttributeTag;
import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
+import org.apache.tiles.jsp.taglib.TilesBodyTag;
import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
/**
* Init definitions impl.
*
* @version $Rev$ $Date$
*/
-public class InitContainerTag extends BodyTagSupport
+public class InitContainerTag extends TilesBodyTag
implements PutAttributeTagParent {
/**
@@ -123,8 +124,9 @@
}
/** {@inheritDoc} */
- public void release() {
- super.release();
+ @Override
+ protected void reset() {
+ super.reset();
containerFactory = null;
containerKey = null;
initParameters = null;
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java?rev=727707&r1=727706&r2=727707&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/SetCurrentContainerTag.java Thu Dec 18 04:35:57 2008
@@ -22,9 +22,9 @@
package org.apache.tiles.jsp.taglib.definition;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
import org.apache.tiles.jsp.context.JspUtil;
+import org.apache.tiles.jsp.taglib.TilesTag;
/**
* Sets the current container, to be used by Tiles tags.
@@ -32,7 +32,7 @@
* @version $Rev$ $Date$
* @since 2.1.0
*/
-public class SetCurrentContainerTag extends TagSupport {
+public class SetCurrentContainerTag extends TilesTag {
/**
* The key under which the container is stored.
@@ -61,7 +61,8 @@
/** {@inheritDoc} */
@Override
- public void release() {
+ protected void reset() {
+ super.reset();
this.containerKey = null;
}