Handle resizing plugin message more robustly by not blocking worker thread

2 files changed, 51 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index e34252d..2036f10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-06-03  Adam Domurad  <[email protected]>
 
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:
+	Handle resizing more robustly by not blocking worker thread 
+
+2013-06-03  Adam Domurad  <[email protected]>
+
 	* netx/net/sourceforge/jnlp/util/StreamUtils.java
 	(copyStream): New, copies input stream to output stream
 	* tests/netx/unit/net/sourceforge/jnlp/cache/NativeLibraryStorageTest.java:
diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
index 8aab9ac..b66f52b 100644
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
@@ -677,53 +677,62 @@ public class PluginAppletViewer extends XEmbeddedFrame
         PluginDebug.debug("Applet panel ", panel, " initialized");
     }
 
-    public void handleMessage(int reference, String message) {
-        if (message.startsWith("width")) {
+    /* Resizes an applet panel, waiting for the applet to initialze. 
+     * Should be done asynchronously to avoid the chance of deadlock. */
+    private void resizeAppletPanel(final int width, final int height) {
+        // Wait for panel to come alive
+        waitForAppletInit(panel);
 
-            // Wait for panel to come alive
-            waitForAppletInit(panel);
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                panel.updateSizeInAtts(height, width);
 
-            // 0 => width, 1=> width_value, 2 => height, 3=> height_value
-            String[] dimMsg = message.split(" ");
+                setSize(width, height);
 
-            final int height = Integer.parseInt(dimMsg[3]);
-            final int width = Integer.parseInt(dimMsg[1]);
+                // There is a rather odd drawing bug whereby resizing
+                // the panel makes no difference on initial call
+                // because the panel thinks that it is already the
+                // right size. Validation has no effect there either.
+                // So we work around by setting size to 1, validating,
+                // and then setting to the right size and validating
+                // again. This is not very efficient, and there is
+                // probably a better way -- but resizing happens
+                // quite infrequently, so for now this is how we do it
 
-            panel.updateSizeInAtts(height, width);
+                panel.setSize(1, 1);
+                panel.validate();
 
-            try {
-                SwingUtilities.invokeAndWait(new Runnable() {
-                    public void run() {
+                panel.setSize(width, height);
+                panel.validate();
 
-                        setSize(width, height);
+                panel.applet.resize(width, height);
+                panel.applet.validate();
+            }
+        });
+    }
 
-                        // There is a rather odd drawing bug whereby resizing
-                        // the panel makes no difference on initial call
-                        // because the panel thinks that it is already the
-                        // right size. Validation has no effect there either.
-                        // So we work around by setting size to 1, validating,
-                        // and then setting to the right size and validating
-                        // again. This is not very efficient, and there is
-                        // probably a better way -- but resizing happens
-                        // quite infrequently, so for now this is how we do it
+    public void handleMessage(int reference, String message) {
+        if (message.startsWith("width")) {
 
-                        panel.setSize(1, 1);
-                        panel.validate();
+            // 0 => width, 1=> width_value, 2 => height, 3=> height_value
+            String[] dimMsg = message.split(" ");
 
-                        panel.setSize(width, height);
-                        panel.validate();
+            final int width = Integer.parseInt(dimMsg[1]);
+            final int height = Integer.parseInt(dimMsg[3]);
 
-                        panel.applet.resize(width, height);
-                        panel.applet.validate();
-                    }
-                });
-            } catch (InterruptedException e) {
-                // do nothing
-                e.printStackTrace();
-            } catch (InvocationTargetException e) {
-                // do nothing
-                e.printStackTrace();
-            }
+            /* Resize the applet asynchronously, to avoid the chance of 
+             * deadlock while waiting for the applet to initialize. 
+             * 
+             * In general, worker threads should spawn new threads for any blocking operations. */
+            Thread resizeAppletThread = new Thread("resizeAppletThread") {
+                @Override
+                public void run() {
+                    resizeAppletPanel(width, height);
+                }
+            };
+
+            /* Let it eventually complete */
+            resizeAppletThread.start();
 
         } else if (message.startsWith("GetJavaObject")) {