AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #225 from pb00068/fixDetectProxy

Browse Source 
autoDetectProxy needs initialized configuration
This commit is contained in:
Michael Bayne
2019-05-31 09:47:18 -07:00
committed by GitHub
parent b5377ca66b bc889e67fd
commit e0c27b4e55
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
+6 -5
View File
@@ -192,11 +192,6 @@ public abstract class Getdown
} }
protected boolean detectProxy () { protected boolean detectProxy () {
boolean tryNoProxy = SysProps.tryNoProxyFirst();
if (!tryNoProxy && ProxyUtil.autoDetectProxy(_app)) {
return true;
}
// see if we actually need a proxy; first we have to initialize our application // see if we actually need a proxy; first we have to initialize our application
// to get some sort of interface configuration and the appbase URL // to get some sort of interface configuration and the appbase URL
log.info("Checking whether we need to use a proxy..."); log.info("Checking whether we need to use a proxy...");
@@ -205,6 +200,12 @@ public abstract class Getdown
} catch (IOException ioe) { } catch (IOException ioe) {
// no worries // no worries
} }
boolean tryNoProxy = SysProps.tryNoProxyFirst();
if (!tryNoProxy && ProxyUtil.autoDetectProxy(_app)) {
return true;
}
updateStatus("m.detecting_proxy"); updateStatus("m.detecting_proxy");
URL configURL = _app.getConfigResource().getRemote(); URL configURL = _app.getConfigResource().getRemote();
if (!ProxyUtil.canLoadWithoutProxy(configURL, tryNoProxy ? 2 : 5)) { if (!ProxyUtil.canLoadWithoutProxy(configURL, tryNoProxy ? 2 : 5)) {