[FIXED JENKINS-10556] Auto Install JDK asks for Oracle account, but t…

…he link goes 404 (cherry picked from commit 6f335c3) Conflicts: changelog.html core/src/main/java/hudson/tools/JDKInstaller.java
jenkinsci · Aug 17, 2011 · 1351434 · 1351434
1 parent d4c0032
commit 1351434
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Auto Install JDK asks for Oracle account, but the link goes 404.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10556">issue 10556</a>)
   <li class=bug>
     Fixed a race condition in the fingerprint computation 
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10346">issue 10346</a>)

diff --git a/core/src/main/java/hudson/tools/JDKInstaller.java b/core/src/main/java/hudson/tools/JDKInstaller.java
@@ -591,6 +591,8 @@ public List<JDKFamily> getInstallableJDKs() throws IOException {
         }
 
         public FormValidation doCheckAcceptLicense(@QueryParameter boolean value) {
+            if (username==null || password==null)
+                return FormValidation.errorWithMarkup(Messages.JDKInstaller_RequireOracleAccount(Stapler.getCurrentRequest().getContextPath()+'/'+getDescriptorUrl()+"/enterCredential"));
             if (value) {
                 return FormValidation.ok();
             } else {