Mercurial > hg > release > icedtea-web-1.0

changeset 115:218e20b249b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent NPE in appletClose() by calling it only via the thread-safe destroyApplet() method.
author Deepak Bhole <dbhole@redhat.com>
date Thu, 07 Apr 2011 18:06:40 -0400
parents 9fd1cd238005
children 4169f6296ed7
files ChangeLog plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Apr 03 19:11:48 2011 -0400
+++ b/ChangeLog	Thu Apr 07 18:06:40 2011 -0400
@@ -1,3 +1,9 @@
+2011-04-07  Deepak Bhole <dbhole@redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+	(constructor): Make window close event call destroy applet which can be
+	safely called multiple times, unlike appletClose.
+
 2011-04-04  Deepak Bhole <dbhole@redhat.com>
 
 	* NEWS: Add 1.0.3
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Sun Apr 03 19:11:48 2011 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Apr 07 18:06:40 2011 -0400
@@ -406,7 +406,7 @@
         windowEventListener = new WindowAdapter() {
 
             public void windowClosing(WindowEvent evt) {
-                appletClose();
+                destroyApplet(identifier);
             }
 
             public void windowIconified(WindowEvent evt) {