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

Timestamp:

2020-10-29T14:00:37+13:00 (3 years ago)

Author:

kjdon

Message:

the no_check_cert_arg is not used for some downloaders, eg z3950, so make sure its not null before trying to assign a value to it.

File:

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

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

@@ -574 +574 @@
         boolean noCheckCertificate = Configuration.get("general.no_check_certificate", true);       
         Argument no_check_cert_arg = current_download.getArgument("no_check_certificate");
-        if(noCheckCertificate) {
-            no_check_cert_arg.setValue("true");
-            no_check_cert_arg.setAssigned(true);
-        } else {
-            no_check_cert_arg.setValue("false");
-            no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
+        if (no_check_cert_arg != null) { // e.g. z3950 doesn't use this
+            if(noCheckCertificate) {
+            no_check_cert_arg.setValue("true");
+            no_check_cert_arg.setAssigned(true);
+            } else {
+            no_check_cert_arg.setValue("false");
+            no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
+            }
         }
-
         Argument arg_url = current_download.getArgument("url");
         
@@ -1004 +1005 @@
         boolean noCheckCertificate = Configuration.get("general.no_check_certificate", true);
         Argument no_check_cert_arg = current_download.getArgument("no_check_certificate");
-        if(noCheckCertificate) {        
-        no_check_cert_arg.setValue("true");
-        no_check_cert_arg.setAssigned(true);
-        } else {
-        no_check_cert_arg.setValue("false");
-        no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
+        if (no_check_cert_arg !=null) { //eg for z3950
+        if(noCheckCertificate) {        
+            no_check_cert_arg.setValue("true");
+            no_check_cert_arg.setAssigned(true);
+        } else {
+            no_check_cert_arg.setValue("false");
+            no_check_cert_arg.setAssigned(false); // only assigned Arguments have values
+        }
         }