Fix #68 don't try to convert a null to an Integer.

Author: Ardesco

src/main/java/com/lazerycode/selenium/download/DetectProxyConfig.java

@@ -1,6 +1,7 @@
 package com.lazerycode.selenium.download;
 
 import com.google.common.base.Strings;
+import org.apache.log4j.Logger;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
@@ -10,6 +11,7 @@
 
 public class DetectProxyConfig {
 
+    private static final Logger LOG = Logger.getLogger(DetectProxyConfig.class);
     private static String host;
     private static int port;
     private static boolean proxyAvailable = false;
@@ -30,7 +32,12 @@ public DetectProxyConfig() {
 
         String proxyHost = System.getProperty("http.proxyHost", System.getenv("http.proxyHost"));
         String proxyPortFromSystem = System.getProperty("http.proxyPort", System.getenv("http.proxyPort"));
-        Integer proxyPort = Integer.valueOf(proxyPortFromSystem);
+        Integer proxyPort = null;
+        try {
+            proxyPort = Integer.valueOf(proxyPortFromSystem);
+        } catch (NumberFormatException ignored) {
+            LOG.debug("Invalid proxy port of '" + proxyPortFromSystem + "' found, ignoring...");
+        }
 
         if (Strings.isNullOrEmpty(proxyHost) || null == proxyPort) {
 

src/test/java/com/lazerycode/selenium/download/DetectProxyConfigTest.java

@@ -29,6 +29,7 @@ public void proxySettingsUsedIfTheyAreSet() {
         System.setProperty("http.proxyPort", "" + port);
 
         DetectProxyConfig proxyConfig = new DetectProxyConfig();
+
         assertThat(proxyConfig.getHost(), is(equalTo(host)));
         assertThat(proxyConfig.getPort(), is(equalTo(port)));
         assertThat(proxyConfig.isProxyAvailable(), is(equalTo(true)));
@@ -40,6 +41,7 @@ public void proxySettingsUsesEnvVariablesIfTheyAreSet() throws Exception {
         envVars.set("http.proxyPort", Integer.toString(envPort));
 
         DetectProxyConfig proxyConfig = new DetectProxyConfig();
+
         assertThat(proxyConfig.getHost(), is(equalTo(envHost)));
         assertThat(proxyConfig.getPort(), is(equalTo(envPort)));
         assertThat(proxyConfig.isProxyAvailable(), is(equalTo(true)));
@@ -55,9 +57,16 @@ public void propertyOverridesEnvVariable() throws Exception {
         envVars.set("http.proxyPort", Integer.toString(envPort));
 
         DetectProxyConfig proxyConfig = new DetectProxyConfig();
+
         assertThat(proxyConfig.getHost(), is(equalTo(propHost)));
         assertThat(proxyConfig.getPort(), is(equalTo(propPort)));
         assertThat(proxyConfig.isProxyAvailable(), is(equalTo(true)));
     }
 
+    @Test
+    public void nullProxyHostOrProxyPort() throws Exception {
+        DetectProxyConfig proxyConfig = new DetectProxyConfig();
+
+        assertThat(proxyConfig.isProxyAvailable(), is(equalTo(false)));
+    }
 }