Mercurial > hg > release > icedtea-web-1.1

changeset 202:225421c775dd

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 24f034f372e4
children e7c791aa1bd2
files ChangeLog plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Apr 06 10:02:46 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-06  Andrew Su  <asu@redhat.com>
 
 	* netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsPane.java:
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Wed Apr 06 10:02:46 2011 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Apr 07 18:06:40 2011 -0400
@@ -407,7 +407,7 @@
         windowEventListener = new WindowAdapter() {
 
             public void windowClosing(WindowEvent evt) {
-                appletClose();
+                destroyApplet(identifier);
             }
 
             public void windowIconified(WindowEvent evt) {