/hg/icedtea6: Fix NPE due to race condition when panel is still ...

[cpdev-commits at icedtea.classpath.org]

changeset 80c259fc02d4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=80c259fc02d4
summary: Fix NPE due to race condition when panel is still being initialized when a

diffstat:

2 files changed, 11 insertions(+), 1 deletion(-)
ChangeLog                                         |    8 ++++++++
plugin/icedtea/sun/applet/PluginAppletViewer.java |    4 +++-

diffs (36 lines):

diff -r 94e9b26a96da -r 80c259fc02d4 ChangeLog
--- a/ChangeLog	Tue Aug 25 10:30:05 2009 -0400
+++ b/ChangeLog	Tue Aug 25 10:34:09 2009 -0400
@@ -1,3 +1,11 @@ 2009-08-25  Deepak Bhole <dbhole at redhat.
+2009-08-25  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java
+	(handleMessage): Wait until panel is set before pinging it for
+	life status.
+	(showStatus): Replace new lines with spaces, as the status is
+	on a single line anyway.
+
 2009-08-25  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedtea/sun/applet/PluginCookieInfoRequest.java
diff -r 94e9b26a96da -r 80c259fc02d4 plugin/icedtea/sun/applet/PluginAppletViewer.java
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java	Tue Aug 25 10:30:05 2009 -0400
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java	Tue Aug 25 10:34:09 2009 -0400
@@ -589,7 +589,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
 
              // Wait for the panel to initialize
              // (happens in a separate thread)
-             while ((o = panel.getApplet()) == null && ((NetxPanel) panel).isAlive()) {
+             while (panel == null || (o = panel.getApplet()) == null && ((NetxPanel) panel).isAlive()) {
             	 try {
             		 Thread.sleep(2000);
             		 PluginDebug.debug("Waiting for applet to initialize...");
@@ -876,6 +876,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
      public void showStatus(String status) {
  	try {
              // FIXME: change to postCallRequest
+ 		// For statuses, we cannot have a newline
+  	    status = status.replace("\n", " ");
  	    write("status " + status);
  	} catch (IOException exception) {
  	    // Deliberately ignore IOException.  showStatus may be