From fbc383d942f047279713ef298d8c4a750c82cde9 Mon Sep 17 00:00:00 2001 From: Guenther Demetz Date: Thu, 6 Jun 2019 10:26:19 +0200 Subject: [PATCH 1/2] Avoid launcher abort due missing engine --- .../com/threerings/getdown/launcher/ProxyUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java index 8962d35..a50d4b7 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java @@ -252,12 +252,12 @@ public final class ProxyUtil { } 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 { + 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"); if (utils == null) { log.error("Unable to load PacUtils.js"); From 338b5a66ef8a730b3eb5af41465596600f6396d6 Mon Sep 17 00:00:00 2001 From: Guenther Demetz Date: Thu, 6 Jun 2019 10:39:14 +0200 Subject: [PATCH 2/2] fix catch --- .../main/java/com/threerings/getdown/launcher/ProxyUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java index a50d4b7..1d90d1e 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java @@ -274,7 +274,7 @@ public final class ProxyUtil { proxies[ii] = proxies[ii].trim(); } return proxies; - } catch (Exception e) { + } catch (Exception | NoClassDefFoundError e) { log.warning("Failed to resolve PAC proxy", e); } return new String[0];