From 483181c0a1a0fdb1cb435164d8a8bbfd76084016 Mon Sep 17 00:00:00 2001 From: Stephen Connolly Date: Fri, 7 Mar 2014 15:29:21 +0000 Subject: [PATCH] [FIXED JENKINS-22080] Braindead logic in author of original fix... corrected by same author --- core/src/main/java/hudson/PluginManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index ccf17cf176..2e4ab887c5 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -695,10 +695,13 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas String siteName = n.substring(index + 1); UpdateSite updateSite = Jenkins.getInstance().getUpdateCenter().getById(siteName); if (siteName != null) { - if (p != null) { - throw new Failure("Ambiguous plugin: " + n); + UpdateSite.Plugin plugin = updateSite.getPlugin(pluginName); + if (plugin != null) { + if (p != null) { + throw new Failure("Ambiguous plugin: " + n); + } + p = plugin; } - p = updateSite.getPlugin(pluginName); } index = n.indexOf('.', index + 1); }