# HG changeset patch
# User Deepak Bhole <dbhole@redhat.com>
# Date 1302214000 14400
# Node ID 218e20b249b86c5d601ddd6a2dc63f797eeb5130
# Parent  9fd1cd2380050f44a7c4135a427287d2a3eacc52
Prevent NPE in appletClose() by calling it only via the thread-safe
destroyApplet() method.

diff -r 9fd1cd238005 -r 218e20b249b8 ChangeLog
--- 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
diff -r 9fd1cd238005 -r 218e20b249b8 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- 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) {