Changeset 31839 for main/trunk/gli/src

Timestamp:

2017-08-01T22:13:20+12:00 (7 years ago)

Author:

ak19

Message:

Fixing a bug in my previous commit: redirectURL() should stop its recursive calls to self on exception. On Mac, it gets an SSLHandShakeShakeException when it resolves a URL to https and tries to retrieve the page (to check for further redirects) before sending off the resolved URL to wget. Fortunately, the newer versions of wget we use being no longer 1.11, but 1.15/1.17 and up, don't require redirectURL to resolve the final URL to start downloading from, as newer versions of wget resolve the final URL for themselves

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -611 +611 @@
     private String getRedirectURL(String url_str) {
     boolean noMoreRedirects = false;
-    
+    boolean gotException = false;
+
     HttpURLConnection connection = null;
     if(url_str.startsWith("http:") || url_str.startsWith("https:")) { // only test http urls
@@ -642 +643 @@
         connection.disconnect();
         } catch(Exception e) {
+        gotException = true;
         if(connection != null) {
             connection.disconnect();
@@ -650 +652 @@
     } 
 
-    if(noMoreRedirects) {
+    if(noMoreRedirects || gotException) {
         return url_str;
     }