Revision: 795
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=795&view=rev
Author: henryju
Date: 2009-01-21 14:17:24 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
[2525065] Fixed memory leak by closing all windows when test ends.
Modified Paths:
--------------
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
trunk/src/changes/changes.xml
Modified:
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
===================================================================
---
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2009-01-21 14:11:01 UTC (rev 794)
+++
trunk/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitTestingEngineImpl.java
2009-01-21 14:17:24 UTC (rev 795)
@@ -180,7 +180,10 @@
public void closeBrowser() throws ExpectedJavascriptAlertException,
ExpectedJavascriptConfirmException,
ExpectedJavascriptPromptException {
- wc = null;
+ if (wc!=null) {
+ wc.closeAllWindows();
+ wc = null;
+ }
form = null; // reset current form
if (this.expectedJavascriptAlerts.size() > 0) {
throw new ExpectedJavascriptAlertException(
@@ -772,7 +775,7 @@
wc.setCredentialsProvider(creds);
wc.addWebWindowListener(new WebWindowListener() {
public void webWindowClosed(WebWindowEvent event) {
- if (event.getOldPage().equals(win.getEnclosedPage())) {
+ if (win==null ||
event.getOldPage().equals(win.getEnclosedPage())) {
win = wc.getCurrentWindow();
form = null;
}
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2009-01-21 14:11:01 UTC (rev 794)
+++ trunk/src/changes/changes.xml 2009-01-21 14:17:24 UTC (rev 795)
@@ -8,10 +8,13 @@
</properties>
<body>
<release version="2.2" date="UNKNOW">
- <action type="update" dev="henryju">
- Updated to HtmlUnit 2.4.
- </action>
- </release>
+ <action type="fix" dev="henryju" issue="2525065" due-to="Sivan
Mozes">
+ WebClient.closeAllWindows() called to prevent memory leak.
+ </action>
+ <action type="update" dev="henryju">
+ Updated to HtmlUnit 2.4.
+ </action>
+ </release>
<release version="2.1" date="December 12, 2008">
<action type="add" dev="jevonwright">
Added new IElement element interface, and methods to directly
access elements by XPath.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
