Merge pull request #1151 from stephenc/master

[FIXED JENKINS-22080] Braindead logic in author of original fix... corre...
jenkinsci · Mar 7, 2014 · 5a6cf8e · 5a6cf8e
2 parents 067acbf + 483181c
commit 5a6cf8e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
@@ -695,10 +695,13 @@ public void doInstall(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
                     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);
                 }