Merge pull request AsyncHttpClient#333 from korinth/ahc-1.7.x

Stephane Landelle · Stephane Landelle · commit 377fb56793c6 · 2013-07-02T13:43:51.000-07:00
Fixed a bug using proxies with the JDK API, found by DanielAdolfsson
diff --git a/src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java b/src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java
@@ -175,12 +175,8 @@ private HttpURLConnection createUrlConnection(Request request) throws IOExceptio
             }
         }
 
-        HttpURLConnection urlConnection = null;
-        if (proxy == null) {
-            urlConnection = (HttpURLConnection) request.getURI().toURL().openConnection(Proxy.NO_PROXY);
-        } else {
-            urlConnection = (HttpURLConnection) proxyServer.getURI().toURL().openConnection(proxy);
-        }
+        HttpURLConnection urlConnection = (HttpURLConnection)
+            request.getURI().toURL().openConnection(proxy == null ? Proxy.NO_PROXY : proxy);
 
         if (request.getUrl().startsWith("https")) {
             HttpsURLConnection secure = (HttpsURLConnection) urlConnection;

Original file line number	Diff line number	Diff line change
`@@ -175,12 +175,8 @@ private HttpURLConnection createUrlConnection(Request request) throws IOExceptio`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`178`		`- HttpURLConnection urlConnection = null;`
`179`		`- if (proxy == null) {`
`180`		`- urlConnection = (HttpURLConnection) request.getURI().toURL().openConnection(Proxy.NO_PROXY);`
`181`		`- } else {`
`182`		`- urlConnection = (HttpURLConnection) proxyServer.getURI().toURL().openConnection(proxy);`
`183`		`- }`
	`178`	`+ HttpURLConnection urlConnection = (HttpURLConnection)`
	`179`	`+ request.getURI().toURL().openConnection(proxy == null ? Proxy.NO_PROXY : proxy);`
`184`	`180`
`185`	`181`	`if (request.getUrl().startsWith("https")) {`
`186`	`182`	`HttpsURLConnection secure = (HttpsURLConnection) urlConnection;`