diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 05050ffeb5..6cb2ff16bb 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -452,6 +452,14 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas session.addAll(g.discoverTasks(session)); } }); + + // All plugins are loaded. Now we can figure out who depends on who. + requires(PLUGINS_PREPARED).attains(COMPLETED).add("Resolving Dependant Plugins Graph", new Executable() { + @Override + public void run(Reactor reactor) throws Exception { + resolveDependantPlugins(); + } + }); }}); } diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index fce3cafa1f..a808088ae6 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -224,6 +224,11 @@ public class WebAppMain implements ServletContextListener { boolean success = false; try { Jenkins instance = new Hudson(_home, context); + + // one last check to make sure everything is in order before we go live + if (Thread.interrupted()) + throw new InterruptedException(); + context.setAttribute(APP, instance); BootFailure.getBootFailureFile(_home).delete(); diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 3e37545782..04701a4555 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -922,9 +922,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve System.currentTimeMillis()-itemListenerStart,l.getClass().getName())); } - // All plugins are loaded. Now we can figure out who depends on who. - resolveDependantPlugins(); - if (LOG_STARTUP_PERFORMANCE) LOGGER.info(String.format("Took %dms for complete Jenkins startup", System.currentTimeMillis()-start)); @@ -933,19 +930,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve } } - private void resolveDependantPlugins() throws InterruptedException, ReactorException, IOException { - TaskGraphBuilder graphBuilder = new TaskGraphBuilder(); - - graphBuilder.add("Resolving Dependant Plugins Graph", new Executable() { - @Override - public void run(Reactor reactor) throws Exception { - pluginManager.resolveDependantPlugins(); - } - }); - - executeReactor(null, graphBuilder); - } - /** * Maintains backwards compatibility. Invoked by XStream when this object is de-serialized. */