From: James Procter Date: Mon, 27 Nov 2023 10:43:33 +0000 (+0000) Subject: Merge branch 'releases/Release_2_11_3_Branch' X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c43deb1df17a3860fc6c9b21c00e1bd62e53ff8e;hp=bec7c06338ee402f6cde54173ddff2295ca702df;p=jalview.git Merge branch 'releases/Release_2_11_3_Branch' --- diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index a64e869..483b1fc 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -1451,10 +1451,11 @@ public class Cache if (customProxySet && // we have a username but no password for the scheme being // requested - (protocol.equalsIgnoreCase("http") - && (httpUser != null && httpUser.length() > 0 - && (httpPassword == null - || httpPassword.length == 0))) + (protocol.equalsIgnoreCase("http") + && (httpUser != null + && httpUser.length() > 0 + && (httpPassword == null + || httpPassword.length == 0))) || (protocol.equalsIgnoreCase("https") && (httpsUser != null && httpsUser.length() > 0