Skip to content
Permalink
Browse files
Merge pull request #2908 from jglick/cleanUp
[JENKINS-44589] Adding some missing calls to cleanUp

(cherry picked from commit 0ec2508)
  • Loading branch information
daniel-beck authored and olivergondza committed Jul 4, 2017
1 parent 65a34e1 commit 92a3e42068c5c54c2861d73d3c2e5fe0c5b64f39
Showing with 3 additions and 0 deletions.
  1. +1 −0 core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
  2. +2 −0 core/src/main/java/jenkins/model/Jenkins.java
@@ -230,6 +230,7 @@ private DefaultLogger createLogger() {
}
});

Jenkins.getInstance().cleanUp();
System.exit(0);
} catch (InterruptedException e) {
e.printStackTrace();
@@ -945,6 +945,7 @@ protected Jenkins(File root, ServletContext context, PluginManager pluginManager


if(KILL_AFTER_LOAD)
// TODO cleanUp?
System.exit(0);

setupWizard = new SetupWizard();
@@ -4262,6 +4263,7 @@ public void doExit( StaplerRequest req, StaplerResponse rsp ) throws IOException
}
}

cleanUp();
System.exit(0);
}

0 comments on commit 92a3e42

Please sign in to comment.