Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-28093] Reverting getDownloadableId from #1563. Not com…
…patible.

(cherry picked from commit 972db2a)
  • Loading branch information
jglick committed May 14, 2015
1 parent 30f1360 commit 83c7f84
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
Expand Up @@ -122,15 +122,15 @@ protected DescriptorImpl() {
}

protected Downloadable createDownloadable() {
return new Downloadable(getDownloadableId());
return new Downloadable(getId());
}

/**
* This ID needs to be unique, and needs to match the ID token in the JSON update file.
* <p>
* By default we use the fully-qualified class name of the {@link DownloadFromUrlInstaller} subtype.
*/
public String getDownloadableId() {
public String getId() {
return clazz.getName().replace('$','.');
}

Expand All @@ -144,7 +144,7 @@ public String getDownloadableId() {
* @return never null.
*/
public List<? extends Installable> getInstallables() throws IOException {
JSONObject d = Downloadable.get(getDownloadableId()).getData();
JSONObject d = Downloadable.get(getId()).getData();
if(d==null) return Collections.emptyList();
return Arrays.asList(((InstallableList)JSONObject.toBean(d,InstallableList.class)).list);
}
Expand Down

0 comments on commit 83c7f84

Please sign in to comment.