From 90efa7b36aa1f7631d2bfc9a426cb5cbb8404499 Mon Sep 17 00:00:00 2001 From: "Donald J. Brown" Date: Thu, 25 Oct 2007 10:11:44 +0000 Subject: [PATCH] Nulling out variables on teardown to fix memory leak in tests WW-1715 git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@588189 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/struts2/views/jsp/AbstractTagTest.java | 10 ++++++++++ .../org/apache/struts2/views/jsp/ui/DateTagTest.java | 1 + 2 files changed, 11 insertions(+) diff --git a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java index 347c2e507..ea1ecaf71 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/AbstractTagTest.java @@ -135,5 +135,15 @@ public abstract class AbstractTagTest extends StrutsTestCase { super.tearDown(); pageContext.verify(); request.verify(); + action = null; + context = null; + session = null; + stack = null; + writer = null; + request = null; + pageContext = null; + response = null; + servletContext = null; + mockContainer = null; } } diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java index 034f1e6dd..f5101ec6c 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java @@ -260,6 +260,7 @@ public class DateTagTest extends AbstractTagTest { protected void tearDown() throws Exception { super.tearDown(); + tag = null; } }