Merge pull request #20 from Sybit-Education/develop

configured Proxy settings proxy can now be set on localhost
Sybit-Education · May 19, 2017 · 3659120 · 3659120
2 parents c174a85 + 612de09
commit 3659120
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/main/java/com/sybit/airtable/Airtable.java b/src/main/java/com/sybit/airtable/Airtable.java
@@ -202,12 +202,7 @@ private void configureProxy(String endpointUrl) {
         if (this.config.getProxy() == null) {
             final String httpProxy = System.getenv("http_proxy");
             final String httpsProxy = System.getenv("https_proxy");
-            if (httpProxy != null
-                    && (endpointUrl.contains("127.0.0.1")
-                    || endpointUrl.contains("localhost"))) {
-                LOG.info("Use Proxy: ignored for 'localhost' ann '127.0.0.1'");
-                setProxy(null);
-            } else if (httpsProxy != null
+            if (httpsProxy != null
                     && (endpointUrl.contains("https"))) {
                 LOG.info("Use Proxy: Environment variable 'https_proxy' found and used: " + httpsProxy);
                 setProxy(httpProxy);
@@ -220,8 +215,10 @@ private void configureProxy(String endpointUrl) {
             }
         } else if ((endpointUrl.contains("127.0.0.1")
                 || endpointUrl.contains("localhost"))) {
-            LOG.info("Use Proxy: ignored for 'localhost' ann '127.0.0.1'");
+            LOG.info("Use Proxy: ignored for 'localhost' and '127.0.0.1'");
             setProxy(null);
+        } else {
+            setProxy(this.config.getProxy());
         }
     }