From a3982900a3c2d586e1b6acd6343ecde9fa37fc46 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 9 Aug 2017 16:58:51 +0200
Subject: Prevent NumberFormatExceptions from breaking everything; NPE in
 PacProxySelector

---
 .../com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java')

diff --git a/src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java
index de81c4c..ecac104 100644
--- a/src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java
+++ b/src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java
@@ -8,14 +8,12 @@ import com.btr.proxy.search.ProxySearchStrategy;
 import com.btr.proxy.search.env.EnvProxySearchStrategy;
 import com.btr.proxy.search.wpad.WpadProxySearchStrategy;
 import com.btr.proxy.selector.direct.NoProxySelector;
-import com.btr.proxy.selector.fixed.FixedProxySelector;
 import com.btr.proxy.selector.misc.ProtocolDispatchSelector;
-import com.btr.proxy.selector.pac.PacProxySelector;
-import com.btr.proxy.selector.pac.UrlPacScriptSource;
 import com.btr.proxy.selector.whitelist.ProxyBypassListSelector;
 import com.btr.proxy.selector.whitelist.UseProxyWhiteListSelector;
 import com.btr.proxy.util.Logger;
 import com.btr.proxy.util.Logger.LogLevel;
+import com.btr.proxy.util.MiscUtil;
 import com.btr.proxy.util.ProxyException;
 import com.btr.proxy.util.ProxyUtil;
 
@@ -84,7 +82,7 @@ public class KdeProxySearchStrategy implements ProxySearchStrategy {
 		}
 
 		ProxySelector result = null;
-		int type = Integer.parseInt(settings.getProperty("ProxyType", "-1"));
+		int type = MiscUtil.parseInt(settings.getProperty("ProxyType", "-1"));
 		switch (type) {
 			case 0: // Use no proxy
 				Logger.log(getClass(), LogLevel.TRACE, "Kde uses no proxy");
-- 
cgit v1.2.3-55-g7522