Permalink
Browse files

[FIXED JENKINS-10689]

integrating newer version of HtmlUnit to fix
memory inefficiency problem.
  • Loading branch information...
1 parent cfc6349 commit 83f204fd5933be1a990c2fe50a5f91ca77c75e87 @kohsuke kohsuke committed Sep 17, 2011
Showing with 5 additions and 6 deletions.
  1. +3 −1 changelog.html
  2. +1 −1 core/pom.xml
  3. +0 −3 core/src/main/java/hudson/tools/JDKInstaller.java
  4. +1 −1 test/pom.xml
View
4 changelog.html
@@ -55,7 +55,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
- <li class=>
+ <li class=bug>
+ Fixed the OutOfMemoryError in trying to download/install JDK
+ (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10689">issue 10689</a>)
</ul>
</div><!--=TRUNK-END=-->
View
2 core/pom.xml
@@ -157,7 +157,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.6-jenkins-4</version>
+ <version>2.6-jenkins-5</version>
<exclusions>
<exclusion>
<groupId>xml-apis</groupId>
View
3 core/src/main/java/hudson/tools/JDKInstaller.java
@@ -393,9 +393,6 @@ public URL locate(TaskListener log, Platform platform, CPU cpu) throws IOExcepti
throw new IOException("Unable to find the login form in "+html.asXml());
}
- // TODO: there's awful inefficiency in htmlunit where it loads the whole binary into one big byte array.
- // needs to modify it to use temporary file or something
-
// download to a temporary file and rename it in to handle concurrency and failure correctly,
File tmp = new File(cache.getPath()+".tmp");
tmp.getParentFile().mkdirs();
View
2 test/pom.xml
@@ -100,7 +100,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.6-jenkins-4</version>
+ <version>2.6-jenkins-5</version>
<exclusions>
<exclusion>
<!-- hides JDK DOM classes in Eclipse -->

0 comments on commit 83f204f

Please sign in to comment.