svn commit: r920892 - /struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsSpringTestCase.java

[lukaszlenart]

Author: lukaszlenart
Date: Tue Mar  9 14:23:07 2010
New Revision: 920892

URL: http://svn.apache.org/viewvc?rev=920892&view=rev
Log:
Solved WW-3402 - memory leak

Modified:
    
struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsSpringTestCase.java

Modified: 
struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsSpringTestCase.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsSpringTestCase.java?rev=920892&r1=920891&r2=920892&view=diff
==============================================================================
--- 
struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsSpringTestCase.java
 (original)
+++ 
struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsSpringTestCase.java
 Tue Mar  9 14:23:07 2010
@@ -28,18 +28,22 @@ import org.springframework.web.context.W
  * Base class for Spring JUnit actions
  */
 public abstract class StrutsSpringTestCase extends StrutsTestCase {
+
     private static final String DEFAULT_CONTEXT_LOCATION = 
"classpath*:applicationContext.xml";
     protected static ApplicationContext applicationContext;
 
-
     protected void setupBeforeInitDispatcher() throws Exception {
-        //init context
-        GenericXmlContextLoader xmlContextLoader = new 
GenericXmlContextLoader();
-        applicationContext = 
xmlContextLoader.loadContext(getContextLocations());
+        // only load beans from spring once
+        if (applicationContext == null) {
+            GenericXmlContextLoader xmlContextLoader = new 
GenericXmlContextLoader();
+            applicationContext = 
xmlContextLoader.loadContext(getContextLocations());
+        }
+
         
servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE,
 applicationContext);
     }
 
     protected String getContextLocations() {
         return DEFAULT_CONTEXT_LOCATION;
     }
+
 }