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

Merge pull request #229 from pb00068/noEngineAvailable

Browse Source 
No engine available
This commit is contained in:
Michael Bayne
2019-07-02 08:07:11 -07:00
committed by GitHub
parent a212a1e7a5 338b5a66ef
commit 66c037feed
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java
+6 -6
View File
@@ -252,12 +252,12 @@ public final class ProxyUtil {
} }
public static String[] findPACProxiesForURL (Reader pac, URL url) { public static String[] findPACProxiesForURL (Reader pac, URL url) {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine engine = manager.getEngineByName("javascript");
Bindings globals = engine.createBindings();
globals.put("resolver", new Resolver());
engine.setBindings(globals, ScriptContext.GLOBAL_SCOPE);
try { try {
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine engine = manager.getEngineByName("javascript");
Bindings globals = engine.createBindings();
globals.put("resolver", new Resolver());
engine.setBindings(globals, ScriptContext.GLOBAL_SCOPE);
URL utils = ProxyUtil.class.getResource("PacUtils.js"); URL utils = ProxyUtil.class.getResource("PacUtils.js");
if (utils == null) { if (utils == null) {
log.error("Unable to load PacUtils.js"); log.error("Unable to load PacUtils.js");
@@ -274,7 +274,7 @@ public final class ProxyUtil {
proxies[ii] = proxies[ii].trim(); proxies[ii] = proxies[ii].trim();
} }
return proxies; return proxies;
} catch (Exception e) { } catch (Exception | NoClassDefFoundError e) {
log.warning("Failed to resolve PAC proxy", e); log.warning("Failed to resolve PAC proxy", e);
} }
return new String[0]; return new String[0];