Menu
▾
▴
[HtmlUnit] SVN: [15060] trunk/htmlunit/src
|
From: <rb...@us...> - 2018-01-06 10:41:12
|
Revision: 15060
http://sourceforge.net/p/htmlunit/code/15060
Author: rbri
Date: 2018-01-06 10:41:09 +0000 (Sat, 06 Jan 2018)
Log Message:
-----------
NPE in com.gargoylesoftware.htmlunit.html.HtmlPage.cleanUp()
Issue 1946
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2018-01-06 08:48:43 UTC (rev 15059)
+++ trunk/htmlunit/src/changes/changes.xml 2018-01-06 10:41:09 UTC (rev 15060)
@@ -8,6 +8,9 @@
<body>
<release version="2.30" date="xx, 2018" description="Bugfixes, URLSearchParams implemented">
+ <action type="fix" dev="rbri" issue="1946">
+ NPE in com.gargoylesoftware.htmlunit.html.HtmlPage.cleanUp().
+ </action>
<action type="add" dev="rbri">
JavaScript: URLSearchParams implementation finished (entries(), keys(), values()).
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java 2018-01-06 08:48:43 UTC (rev 15059)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HtmlPage.java 2018-01-06 10:41:09 UTC (rev 15060)
@@ -331,9 +331,6 @@
cleaning_ = false;
if (autoCloseableList_ != null) {
for (final AutoCloseable closeable : new ArrayList<>(autoCloseableList_)) {
- if (closeable == null) {
- continue;
- }
try {
closeable.close();
}
@@ -2326,6 +2323,10 @@
* @param autoCloseable the autoclosable
*/
public void addAutoCloseable(final AutoCloseable autoCloseable) {
+ if (autoCloseable == null) {
+ return;
+ }
+
if (autoCloseableList_ == null) {
autoCloseableList_ = new ArrayList<>();
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java 2018-01-06 08:48:43 UTC (rev 15059)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlPageTest.java 2018-01-06 10:41:09 UTC (rev 15060)
@@ -1902,6 +1902,17 @@
page.addAutoCloseable(new WebSocket());
}
});
+ page.cleanUp();
}
+ /**
+ * @exception Exception If the test fails
+ */
+ @Test
+ public void addAutoCloseableNull() throws Exception {
+ final String html = "";
+ final HtmlPage page = loadPage(html);
+ page.addAutoCloseable(null);
+ page.cleanUp();
+ }
}
|
