Merge pull request #4511 from gohai/fix-downloader

benfry · benfry · commit ec2cb24650dc · 2016-06-02T16:21:24.000-04:00
Fix Downloader
diff --git a/build/build.xml b/build/build.xml
@@ -835,11 +835,11 @@
     -->
 
     <!-- use the jre subfolder when having downloaded a JDK file -->
-    <condition property="jre.dir" value="jdk${jdk.esoteric}/jre/">
+    <condition property="jre.dir" value="jdk${jdk.esoteric}/jre">
       <!-- property might not be set, but it is for arm -->
       <equals arg1="${jre.download.jdk}" arg2="true" />
     </condition>
-    <condition property="jre.dir" value="jre${jdk.esoteric}/">
+    <condition property="jre.dir" value="jre${jdk.esoteric}">
       <not>
         <equals arg1="${jre.download.jdk}" arg2="true" />
       </not>
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();`