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

---
 src/main/java/com/btr/proxy/selector/pac/UrlPacScriptSource.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com/btr/proxy/selector/pac/UrlPacScriptSource.java')

diff --git a/src/main/java/com/btr/proxy/selector/pac/UrlPacScriptSource.java b/src/main/java/com/btr/proxy/selector/pac/UrlPacScriptSource.java
index c31b2d0..085d056 100644
--- a/src/main/java/com/btr/proxy/selector/pac/UrlPacScriptSource.java
+++ b/src/main/java/com/btr/proxy/selector/pac/UrlPacScriptSource.java
@@ -14,6 +14,7 @@ import java.net.URL;
 
 import com.btr.proxy.util.Logger;
 import com.btr.proxy.util.Logger.LogLevel;
+import com.btr.proxy.util.MiscUtil;
 
 /*****************************************************************************
  * Script source that will load the content of a PAC file from an webserver.
@@ -207,7 +208,7 @@ public class UrlPacScriptSource implements PacScriptSource {
 		String prop = System.getProperty(overrideProperty);
 		if (prop != null && prop.trim().length() > 0) {
 			try {
-				timeout = Integer.parseInt(prop.trim());
+				timeout = MiscUtil.parseInt(prop.trim());
 			} catch (NumberFormatException e) {
 				Logger.log(getClass(), LogLevel.DEBUG, "Invalid override property : {0}={1}", overrideProperty, prop);
 				// In this case use the default value.
-- 
cgit v1.2.3-55-g7522