Merge pull request #902 from AdoptOpenJDK/ows-hangs-on-filenotfound

Ows hangs on filenotfound

Author: sclassen

core/src/main/java/net/adoptopenjdk/icedteaweb/client/GuiLaunchHandler.java

@@ -35,6 +35,8 @@
 
 import net.adoptopenjdk.icedteaweb.client.parts.splashscreen.JNLPSplashScreen;
 import net.adoptopenjdk.icedteaweb.jnlp.element.information.IconKind;
+import net.adoptopenjdk.icedteaweb.logging.Logger;
+import net.adoptopenjdk.icedteaweb.logging.LoggerFactory;
 import net.adoptopenjdk.icedteaweb.resources.ResourceTracker;
 import net.adoptopenjdk.icedteaweb.ui.swing.SwingUtils;
 import net.sourceforge.jnlp.AbstractLaunchHandler;
@@ -53,6 +55,7 @@
  */
 public class GuiLaunchHandler extends AbstractLaunchHandler {
 
+    private static final Logger LOG = LoggerFactory.getLogger(GuiLaunchHandler.class);
     private volatile JNLPSplashScreen splashScreen = null;
     private final Object mutex = new Object();
 
@@ -67,6 +70,7 @@ public void launchCompleted(ApplicationInstance application) {
 
     @Override
     public void handleLaunchError(final LaunchException exception) {
+        LOG.debug("HandleLaunchError Sbow BasicExceptionDialog {}", exception.getMessage());
         BasicExceptionDialog.willBeShown();
         SwingUtils.invokeLater(() -> {
             closeSplashScreen();

core/src/main/java/net/adoptopenjdk/icedteaweb/resources/ResourceHandler.java

@@ -93,8 +93,8 @@ private static void validateWithWhitelist(URL url) {
         if (isUrlInWhitelist(url, getApplicationUrlWhiteList())) {
             return;
         }
-        BasicExceptionDialog.show(new SecurityException(Translator.R("SWPInvalidURL") + ": " + url));
         LOG.error("Resource URL not In Whitelist: {}", url);
+        BasicExceptionDialog.show(new SecurityException(Translator.R("SWPInvalidURL") + ": " + url));
         JNLPRuntime.exit(-1);
     }
 }

core/src/main/java/net/adoptopenjdk/icedteaweb/resources/downloader/BaseResourceDownloader.java

@@ -12,12 +12,14 @@
 import net.adoptopenjdk.icedteaweb.resources.Resource;
 import net.adoptopenjdk.icedteaweb.resources.cache.Cache;
 import net.adoptopenjdk.icedteaweb.resources.cache.DownloadInfo;
+import net.adoptopenjdk.icedteaweb.ui.swing.SwingUtils;
 import net.sourceforge.jnlp.config.ConfigurationConstants;
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.util.UrlUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.Socket;
@@ -73,7 +75,7 @@ public Resource download() {
                 .map(Optional::get)
                 .findFirst()
                 .orElseGet(() -> {
-                    LOG.error("could not download resource {} from any of theses urls {} {}", resource, downloadUrls, exceptionMessage());
+                    LOG.error("Could not download resource {} from any of theses urls {} {}", resource, downloadUrls, exceptionMessage());
                     resource.setStatus(ERROR);
                     checkForProxyError();
                     return resource;
@@ -104,9 +106,13 @@ private String exceptionMessage(final Exception e) {
     private void checkForProxyError() {
         for (final Exception excp : downLoadExceptions) {
             final Throwable cause = excp.getCause();
-            if (cause instanceof IOException && cause.getMessage().toLowerCase().contains("proxy")) {
-                BasicExceptionDialog.show((IOException) cause);
-                JNLPRuntime.exit(-1);
+            if (cause instanceof IOException && !(cause instanceof FileNotFoundException) && cause.getMessage().toLowerCase().contains("proxy")) {
+                LOG.debug("checkForProxyError : show Exception Dialog for exception :  {} cause : {}", excp.getMessage(), cause.getMessage());
+                BasicExceptionDialog.willBeShown();
+                SwingUtils.invokeLater(() -> {
+                    BasicExceptionDialog.show((IOException) cause);
+                    JNLPRuntime.exit(-1, false);
+                });
             }
         }
     }
@@ -118,6 +124,7 @@ private CompletableFuture<Resource> downloadFrom(final URL url) {
             try {
                 result.complete(tryDownloading(url));
             } catch (Exception | Error e) {
+                LOG.debug("downloadFrom exception: {}", e.getMessage());
                 result.completeExceptionally(e);
             }
         });
@@ -131,6 +138,7 @@ private Resource tryDownloading(final URL downloadFrom) throws IOException {
 
             if (downloadDetails.contentType != null && downloadDetails.contentType.startsWith(ERROR_MIME_TYPE)) {
                 final String serverResponse = StreamUtils.readStreamAsString(downloadDetails.inputStream);
+                LOG.debug("Server Error for {}", resource);
                 throw new RuntimeException("Server error: " + serverResponse);
             }
 

core/src/main/java/net/sourceforge/jnlp/runtime/JNLPRuntime.java

@@ -894,12 +894,19 @@ private static boolean isPluginDebug() {
         return pluginDebug;
     }
 
-    public static <T> T exit(int i) {
-        waitForExceptionDialogsToBeClosed();
+    public static <T> T exit(int i, boolean waitToCloseExceptionDialogs) {
+        LOG.debug("JNLPRuntime,exit()");
+        if (waitToCloseExceptionDialogs) {
+            waitForExceptionDialogsToBeClosed();
+        }
         System.exit(i);
         return null;
     }
 
+    public static <T> T exit(int i) {
+        return exit(i, true);
+    }
+
     public static void waitForExceptionDialogsToBeClosed() {
         try {
             if (BasicExceptionDialog.areShown()) {