Prevent NPE in appletClose() by calling it only via the thread-safe

destroyApplet() method.

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 99c688b..e6b15ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-07  Deepak Bhole <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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) {