From bc26ed6f2e9d5a2fae7156011ebd9932187dc073 Mon Sep 17 00:00:00 2001 From: Luca Moretto Date: Tue, 18 Dec 2018 10:00:48 +0100 Subject: [PATCH 1/2] Added IntelliJ IDEA related entries to .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 22ea5562..195e28cb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,9 @@ .classpath bin/ +# IntelliJ IDEA +.idea/ +*.iml + # Maven target/ From dc673fb25cc02ee1d0f10d1129d3721a12a403a1 Mon Sep 17 00:00:00 2001 From: Luca Moretto Date: Tue, 18 Dec 2018 10:25:11 +0100 Subject: [PATCH 2/2] Made PacScriptParser implementation customizable --- .../proxy/selector/pac/PacProxySelector.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/markusbernhardt/proxy/selector/pac/PacProxySelector.java b/src/main/java/com/github/markusbernhardt/proxy/selector/pac/PacProxySelector.java index 2ba3d657..c46af519 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/selector/pac/PacProxySelector.java +++ b/src/main/java/com/github/markusbernhardt/proxy/selector/pac/PacProxySelector.java @@ -25,7 +25,7 @@ public class PacProxySelector extends ProxySelector { private static final String PAC_SOCKS = "SOCKS"; private static final String PAC_DIRECT = "DIRECT"; - private PacScriptParser pacScriptParser; + private final PacScriptParser pacScriptParser; private static volatile boolean enabled = true; @@ -38,7 +38,7 @@ public class PacProxySelector extends ProxySelector { public PacProxySelector(PacScriptSource pacSource) { super(); - selectEngine(pacSource); + pacScriptParser = selectEngine(pacSource); } /************************************************************************* @@ -70,12 +70,13 @@ public static boolean isEnabled() { * to use as input. ************************************************************************/ - private void selectEngine(PacScriptSource pacSource) { + protected PacScriptParser selectEngine(PacScriptSource pacSource) { try { Logger.log(getClass(), LogLevel.INFO, "Using javax.script JavaScript engine."); - pacScriptParser = new JavaxPacScriptParser(pacSource); + return new JavaxPacScriptParser(pacSource); } catch (Exception e) { Logger.log(getClass(), LogLevel.ERROR, "PAC parser error.", e); + return null; } }