From 993ebee50c797888ea824cc54a8845da61cde926 Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Thu, 7 Apr 2011 18:06:40 -0400 Subject: Prevent NPE in appletClose() by calling it only via the thread-safe destroyApplet() method. --- ChangeLog | 6 ++++++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 99c688b..e6b15ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-04-07 Deepak Bhole + + * 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 * netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsPane.java: diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java index df29e3f..9099524 100644 --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java @@ -407,7 +407,7 @@ public class PluginAppletViewer extends XEmbeddedFrame windowEventListener = new WindowAdapter() { public void windowClosing(WindowEvent evt) { - appletClose(); + destroyApplet(identifier); } public void windowIconified(WindowEvent evt) { -- cgit v1.2.3