[icedtea-web] RFC: Patch to fix PR778

[Deepak Bhole]

Hi,

This is a patch to fix PR778 -
"Jar download and server certificate verification deadlock":
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=778

ChangeLog:
2011-10-20  Deepak Bhole <dbhole at redhat.com>

    PR778: Jar download and server certificate verification deadlock
    * netx/net/sourceforge/jnlp/GuiLaunchHandler.java (launchInitialized):
    Moved as much code as possible out of the invokeLater block.

Unfortunately, the reproducer from the site has gone off-line and I was unable
to create one. I did however try this patch with the original reproducer and it
worked fine.

Even without a reproducer, it makes sense from a logical standpoint to have as
little as possible in an invokeLater call.

Ok for head and 1.1?

Cheers,
Deepak
-------------- next part --------------
diff -r 16c81f4dcf12 netx/net/sourceforge/jnlp/GuiLaunchHandler.java
--- a/netx/net/sourceforge/jnlp/GuiLaunchHandler.java	Fri Sep 23 12:05:43 2011 -0400
+++ b/netx/net/sourceforge/jnlp/GuiLaunchHandler.java	Tue Oct 11 17:06:04 2011 -0400
@@ -95,20 +95,27 @@
 
     @Override
     public void launchInitialized(final JNLPFile file) {
+        
+        int preferredWidth = 500;
+        int preferredHeight = 400;
+
+        final URL splashImageURL = file.getInformation().getIconLocation(
+                IconDesc.SPLASH, preferredWidth, preferredHeight);
+
+        if (splashImageURL != null) {
+            ResourceTracker resourceTracker = new ResourceTracker(true);
+            resourceTracker.addResource(splashImageURL, file.getFileVersion(), null, policy);
+            synchronized(mutex) {
+                splashScreen = new JNLPSplashScreen(resourceTracker, null, null);
+                splashScreen.setSplashImageURL(splashImageURL);
+            }
+        }
+        
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                final int preferredWidth = 500;
-                final int preferredHeight = 400;
-
-                URL splashImageURL = file.getInformation().getIconLocation(
-                        IconDesc.SPLASH, preferredWidth, preferredHeight);
                 if (splashImageURL != null) {
-                    ResourceTracker resourceTracker = new ResourceTracker(true);
-                    resourceTracker.addResource(splashImageURL, file.getFileVersion(), null, policy);
                     synchronized(mutex) {
-                        splashScreen = new JNLPSplashScreen(resourceTracker, null, null);
-                        splashScreen.setSplashImageURL(splashImageURL);
                         if (splashScreen.isSplashScreenValid()) {
                             splashScreen.setVisible(true);
                         }