rtyler
/
jenkins
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2908 from jglick/cleanUp 

[JENKINS-44589] Adding some missing calls to cleanUp
This commit is contained in:
Daniel Beck 2017-06-03 09:32:02 +02:00 committed by GitHub
parent 59ae1f69fc 9df863d778
commit 0ec25081ee
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
View File

@ -230,6 +230,7 @@ public class WindowsInstallerLink extends ManagementLink {
}
});
Jenkins.getInstance().cleanUp();
System.exit(0);
} catch (InterruptedException e) {
e.printStackTrace();

2
core/src/main/java/jenkins/model/Jenkins.java
View File

@ -945,6 +945,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
if(KILL_AFTER_LOAD)
// TODO cleanUp?
System.exit(0);
setupWizard = new SetupWizard();
@ -4262,6 +4263,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
}
}
cleanUp();
System.exit(0);
}