root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[SPR-5927] fixed FormTag attribute clearing

This commit is contained in:
Rob Harrop 2009-09-06 19:09:29 +00:00
parent b18a1dc5b3
commit afd6fe9048
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java
View File

@ -423,6 +423,15 @@ public class FormTag extends AbstractHtmlElementTag {
@Override @Override
public int doEndTag() throws JspException { public int doEndTag() throws JspException {
this.tagWriter.endTag(); this.tagWriter.endTag();
return EVAL_PAGE;
}
/**
* Clears the stored {@link TagWriter}.
*/
@Override
public void doFinally() {
super.doFinally();
this.pageContext.removeAttribute(MODEL_ATTRIBUTE_VARIABLE_NAME, PageContext.REQUEST_SCOPE); this.pageContext.removeAttribute(MODEL_ATTRIBUTE_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
this.pageContext.removeAttribute(COMMAND_NAME_VARIABLE_NAME, PageContext.REQUEST_SCOPE); this.pageContext.removeAttribute(COMMAND_NAME_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
if (this.previousNestedPath != null) { if (this.previousNestedPath != null) {
@ -433,15 +442,6 @@ public class FormTag extends AbstractHtmlElementTag {
// Remove exposed nestedPath value. // Remove exposed nestedPath value.
this.pageContext.removeAttribute(NESTED_PATH_VARIABLE_NAME, PageContext.REQUEST_SCOPE); this.pageContext.removeAttribute(NESTED_PATH_VARIABLE_NAME, PageContext.REQUEST_SCOPE);
} }
return EVAL_PAGE;
}
/**
* Clears the stored {@link TagWriter}.
*/
@Override
public void doFinally() {
super.doFinally();
this.tagWriter = null; this.tagWriter = null;
this.previousNestedPath = null; this.previousNestedPath = null;
} }

10
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
View File

@ -253,6 +253,16 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
assertContainsAttribute(inputOutput, "type", "hidden"); assertContainsAttribute(inputOutput, "type", "hidden");
} }
public void testClearAttributesOnFinally() throws Exception {
this.tag.setModelAttribute("model");
getPageContext().setAttribute("model", "foo bar");
assertNull(getPageContext().getAttribute(FormTag.MODEL_ATTRIBUTE_VARIABLE_NAME, PageContext.REQUEST_SCOPE));
this.tag.doStartTag();
assertNotNull(getPageContext().getAttribute(FormTag.MODEL_ATTRIBUTE_VARIABLE_NAME, PageContext.REQUEST_SCOPE));
this.tag.doFinally();
assertNull(getPageContext().getAttribute(FormTag.MODEL_ATTRIBUTE_VARIABLE_NAME, PageContext.REQUEST_SCOPE));
}
private String getFormTag(String output) { private String getFormTag(String output) {
int inputStart = output.indexOf("<", 1); int inputStart = output.indexOf("<", 1);
int inputEnd = output.lastIndexOf(">", output.length() - 2); int inputEnd = output.lastIndexOf(">", output.length() - 2);