Skip to content
Permalink
Browse files

Merge pull request #20 from mrdfuse/JENKINS-25064

[FIXED JENKINS-25064] Instead of constructing the toollocation key, just use the existing descriptor
  • Loading branch information...
mindjiver committed Nov 6, 2014
2 parents 30ee1f1 + 73da69a commit 0dddc0fccbbe5797ef4b8a032ed19948092da18a
Showing with 2 additions and 3 deletions.
  1. +2 −3 plugin/src/main/java/hudson/plugins/swarm/PluginImpl.java
@@ -90,11 +90,10 @@ public void doCreateSlave(StaplerRequest req, StaplerResponse rsp, @QueryParamet
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);
}
}

0 comments on commit 0dddc0f

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