Now handling that proxy settings can be null because `URLConnection…

….openConnection()` and `URLConnection.openConnection(Proxy.NO_PROXY)` don't behave the same
ceylon · May 6, 2015 · 65b75f1 · 65b75f1 · quintesse · May 6, 2015
1 parent 3c1be3a
commit 65b75f1
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/com/redhat/ceylon/ceylondoc/LinkRenderer.java b/src/com/redhat/ceylon/ceylondoc/LinkRenderer.java
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.net.HttpURLConnection;
+import java.net.Proxy;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -781,7 +782,14 @@ private boolean checkHttpUrlExist(String moduleUrl) {
         Boolean result = ceylonDocTool.getModuleUrlAvailabilityCache().get(moduleUrl);
         if( result == null ) {
             try {
-                HttpURLConnection con = (HttpURLConnection) new URL(moduleUrl + "index.html").openConnection(DefaultToolOptions.getDefaultProxy());
+                URL url = new URL(moduleUrl + "index.html");
+                HttpURLConnection con;
+                Proxy proxy = DefaultToolOptions.getDefaultProxy();
+                if (proxy != null) {
+                    con = (HttpURLConnection) url.openConnection(proxy);
+                } else {
+                    con = (HttpURLConnection) url.openConnection();
+                }
                 con.setConnectTimeout((int) DefaultToolOptions.getDefaultTimeout());
                 con.setReadTimeout((int) DefaultToolOptions.getDefaultTimeout() * Constants.READ_TIMEOUT_MULTIPLIER);
                 con.setRequestMethod("HEAD");