Skip to content

Commit

Permalink
[FIXED JENKINS-10556] Auto Install JDK asks for Oracle account, but t…
Browse files Browse the repository at this point in the history
…he link goes 404
  • Loading branch information
ssogabe committed Aug 2, 2011
1 parent 3e52131 commit 6f335c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion changelog.html
Expand Up @@ -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>
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>)
</ul>
</div><!--=TRUNK-END=-->

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/tools/JDKInstaller.java
Expand Up @@ -630,7 +630,7 @@ 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"));
return FormValidation.errorWithMarkup(Messages.JDKInstaller_RequireOracleAccount(Stapler.getCurrentRequest().getContextPath()+'/'+getDescriptorUrl()+"/enterCredential"));

This comment has been minimized.

Copy link
@ndeloof

ndeloof Dec 16, 2011

Contributor

Should have used getCredentialPageUrl() here to avoid code duplication (and as well this bug)

if (value) {
return FormValidation.ok();
} else {
Expand Down

0 comments on commit 6f335c3

Please sign in to comment.