/hg/icedtea-web: Prevent NPE in appletClose() by calling it only...

[dbhole at icedtea.classpath.org]

changeset 225421c775dd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=225421c775dd
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Apr 07 18:06:40 2011 -0400

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


diffstat:

 ChangeLog                                                |  6 ++++++
 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java |  2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 24f034f372e4 -r 225421c775dd ChangeLog
--- 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 at 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 at redhat.com>
 
 	* netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsPane.java:
diff -r 24f034f372e4 -r 225421c775dd plugin/icedteanp/java/sun/applet/PluginAppletViewer.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) {