[FIXED JENKINS-25064] Instead of constructing the toollocation key, j…

…ust use the existing descriptor
jenkinsci · Oct 9, 2014 · 73da69a · 73da69a
1 parent 30ee1f1
commit 73da69a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/plugin/src/main/java/hudson/plugins/swarm/PluginImpl.java b/plugin/src/main/java/hudson/plugins/swarm/PluginImpl.java
@@ -90,11 +90,10 @@ private List<ToolLocation> parseToolLocations(String toolLocations) {
 				for (ToolInstallation inst : desc.getInstallations()) {
 					if (inst.getName().equals(toolLoc[0])) {
 						found = true;
-
-						String key = inst.getClass().getCanonicalName().toString() + "$DescriptorImpl@" + inst.getName();
+
 						String location = toolLoc[1];
 
-						ToolLocationNodeProperty.ToolLocation toolLocation = new ToolLocationNodeProperty.ToolLocation(key, location);
+						ToolLocationNodeProperty.ToolLocation toolLocation = new ToolLocationNodeProperty.ToolLocation(desc, inst.getName(), location);
 						result.add(toolLocation);
 					}
 				}