Merge pull request #2177 from jenkinsci/2nd-reactor

Don't go through init sequence twice
This commit is contained in:
Kohsuke Kawaguchi committed 2016-05-02 08:49:32 -07:00
commit f238ade13e
3 files changed
+13 -16

No files matched your search

@@ -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();