Skip to content
Permalink
Browse files

[FIXED JENKINS-28093] Reverting getDownloadableId from #1563. Not com…

…patible.

(cherry picked from commit 972db2a)
  • Loading branch information...
jglick committed Apr 28, 2015
1 parent 30f1360 commit 83c7f8467c15e10b18833acae1154bdf285a589a
Showing with 3 additions and 3 deletions.
  1. +3 −3 core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
@@ -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('$','.');
}

@@ -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);
}

0 comments on commit 83c7f84

Please sign in to comment.
You can’t perform that action at this time.