Fix Downloader

gohai · gohai · commit 9ef0d4c15ebd · 2016-05-27T07:15:57.000+02:00
Addresses #4496. Enough to get JRE downloads to work again.
diff --git a/build/jre/src/Downloader.java b/build/jre/src/Downloader.java
@@ -158,8 +158,10 @@ void download() throws IOException {
       }
       List<String> cookies = headers.get("Set-Cookie");
       conn = (HttpURLConnection) new URL(url).openConnection();
-      for (String cookie : cookies) {
-        conn.setRequestProperty("Cookie", cookie);
+      if (cookies != null) {
+        for (String cookie : cookies) {
+          conn.setRequestProperty("Cookie", cookie);
+        }
       }
       conn.setRequestProperty("Cookie", COOKIE);
       conn.connect();

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,10 @@ void download() throws IOException {`
`158`	`158`	`}`
`159`	`159`	`List<String> cookies = headers.get("Set-Cookie");`
`160`	`160`	`conn = (HttpURLConnection) new URL(url).openConnection();`
`161`		`- for (String cookie : cookies) {`
`162`		`- conn.setRequestProperty("Cookie", cookie);`
	`161`	`+ if (cookies != null) {`
	`162`	`+ for (String cookie : cookies) {`
	`163`	`+ conn.setRequestProperty("Cookie", cookie);`
	`164`	`+ }`
`163`	`165`	`}`
`164`	`166`	`conn.setRequestProperty("Cookie", COOKIE);`
`165`	`167`	`conn.connect();`