Changeset 17282 for gli/trunk/src/org/greenstone/gatherer/gui/DownloadPane.java

Timestamp:

2008-09-15T12:23:30+12:00 (16 years ago)

Author:

ak19

Message:

Fixed ull-pointer exception thrown (when using Z3950) by code recently added for Wget.

File:

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

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

@@ -169 +169 @@
     edit_pane.add(mode_pane,BorderLayout.CENTER);
     edit_pane.add(button_pane,BorderLayout.PAGE_END);
-
+    
     // Add to "this"
     setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -502 +502 @@
         Download current_download = (Download)download_map.get(mode);
         Argument arg_url = current_download.getArgument("url");
-        String url_str = arg_url.getValue();
-        String redirect_url_str = getRedirectURL(url_str);
-        
-        // only update the Argument and its GUI ArgumentControl if the URL
-        // has in fact changed
-        if(!url_str.equals(redirect_url_str)) {
-            arg_url.setValue(redirect_url_str);
-            updateArgument(arg_url, redirect_url_str);
-        }
-    
+        if(arg_url != null) { // it's null for z3950 and possibly for other downloaders
+            String url_str = arg_url.getValue();
+            String redirect_url_str = getRedirectURL(url_str);
+            
+            // only update the Argument and its GUI ArgumentControl if the URL
+            // has in fact changed
+            if(!url_str.equals(redirect_url_str)) {
+            arg_url.setValue(redirect_url_str);
+            updateArgument(arg_url, redirect_url_str);
+            }
+        }
         getter.newDownloadJob((Download)download_map.get(mode) ,mode,proxy_url);
         }