diff options
author | Simon Rettberg | 2017-08-09 16:58:51 +0200 |
---|---|---|
committer | Simon Rettberg | 2017-08-09 16:58:51 +0200 |
commit | a3982900a3c2d586e1b6acd6343ecde9fa37fc46 (patch) | |
tree | bde25aea72f0630ebb6a35a9e9bc4eeb76fcf4e1 /src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java | |
parent | Sophisticate proxy parsing and generating, fix misinterpretation if SOCKS pro... (diff) | |
download | proxy-vole-a3982900a3c2d586e1b6acd6343ecde9fa37fc46.tar.gz proxy-vole-a3982900a3c2d586e1b6acd6343ecde9fa37fc46.tar.xz proxy-vole-a3982900a3c2d586e1b6acd6343ecde9fa37fc46.zip |
Prevent NumberFormatExceptions from breaking everything; NPE in PacProxySelector
Diffstat (limited to 'src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java')
-rw-r--r-- | src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java index f1853b7..83e746e 100644 --- a/src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java +++ b/src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java @@ -9,6 +9,7 @@ import com.btr.proxy.selector.misc.ProtocolDispatchSelector; import com.btr.proxy.selector.whitelist.ProxyBypassListSelector; import com.btr.proxy.util.Logger; import com.btr.proxy.util.Logger.LogLevel; +import com.btr.proxy.util.MiscUtil; /***************************************************************************** * Reads some java system properties and extracts the proxy settings from them. @@ -96,7 +97,7 @@ public class JavaProxySearchStrategy implements ProxySearchStrategy { String port = System.getProperty("socksProxyPort", "1080"); if (host != null && host.trim().length() > 0) { Logger.log(getClass(), LogLevel.TRACE, "Socks proxy {0}:{1} found", host, port); - ps.setSelector("socks", new FixedProxySelector(Proxy.Type.SOCKS, host, Integer.parseInt(port))); + ps.setSelector("socks", new FixedProxySelector(Proxy.Type.SOCKS, host, MiscUtil.parseInt(port))); } } @@ -122,7 +123,7 @@ public class JavaProxySearchStrategy implements ProxySearchStrategy { Logger.log(getClass(), LogLevel.TRACE, protocol.toUpperCase()+" proxy {0}:{1} found using whitelist: {2}", host, port, whiteList); - ProxySelector protocolSelector = new FixedProxySelector(Proxy.Type.HTTP, host, Integer.parseInt(port)); + ProxySelector protocolSelector = new FixedProxySelector(Proxy.Type.HTTP, host, MiscUtil.parseInt(port)); if (whiteList.trim().length() > 0) { protocolSelector = new ProxyBypassListSelector(whiteList, protocolSelector); } |