From 83c7f8467c15e10b18833acae1154bdf285a589a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 28 Apr 2015 16:47:30 -0400 Subject: [PATCH] [FIXED JENKINS-28093] Reverting getDownloadableId from #1563. Not compatible. (cherry picked from commit 972db2a593fc978b8fb16a8d14cf485b8679c6e2) --- .../main/java/hudson/tools/DownloadFromUrlInstaller.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java index 418f7fd1e7..938325f668 100644 --- a/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java +++ b/core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java @@ -122,7 +122,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller { } protected Downloadable createDownloadable() { - return new Downloadable(getDownloadableId()); + return new Downloadable(getId()); } /** @@ -130,7 +130,7 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller { *

* 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 abstract class DownloadFromUrlInstaller extends ToolInstaller { * @return never null. */ public List 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); } -- GitLab