Fixes issue #1078 (#1079)

* Fixes issue #1078 Check the "socksProxyHost" system property not only for null, but also for emptiness * #1078: Added test and fixed code style issues
pgjdbc · Jan 19, 2018 · 0d51370 · 0d51370
1 parent fe463bc
commit 0d51370
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/pgjdbc/src/main/java/org/postgresql/util/HostSpec.java b/pgjdbc/src/main/java/org/postgresql/util/HostSpec.java
@@ -48,7 +48,8 @@ public int hashCode() {
   }
 
   public Boolean shouldResolve() {
-    if (System.getProperty("socksProxyHost") == null) {
+    String socksProxy = System.getProperty("socksProxyHost");
+    if (socksProxy == null || socksProxy.trim().isEmpty()) {
       return true;
     }
     return matchesNonProxyHosts();

diff --git a/pgjdbc/src/test/java/org/postgresql/test/util/HostSpecTest.java b/pgjdbc/src/test/java/org/postgresql/test/util/HostSpecTest.java
@@ -32,6 +32,20 @@ public void testShouldResolve() throws Exception {
     assertTrue(hostSpec.shouldResolve());
   }
 
+  @Test
+  public void testShouldResolveWithEmptySocksProxyHost() throws Exception {
+    System.setProperty("socksProxyHost", "");
+    HostSpec hostSpec = new HostSpec("localhost", 5432);
+    assertFalse(hostSpec.shouldResolve());
+  }
+
+  @Test
+  public void testShouldResolveWithWhiteSpaceSocksProxyHost() throws Exception {
+    System.setProperty("socksProxyHost", " ");
+    HostSpec hostSpec = new HostSpec("localhost", 5432);
+    assertFalse(hostSpec.shouldResolve());
+  }
+
   @Test
   public void testShouldResolveWithSocksProxyHost() throws Exception {
     System.setProperty("socksProxyHost", "fake-socks-proxy");