OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 21:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[JENKINS-32820] Fix the last merge issues

Browse Source
This commit is contained in:
Oleg Nenashev committed 2017-02-12 14:33:03 +03:00
1 parent 579a88d6e7
commit 08a993d7bc
3 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class SolarisSMFLifecycle extends Lifecycle {
*/
@Override
public void restart() throws IOException, InterruptedException {
Jenkins h = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
Jenkins jenkins = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
try {
if (jenkins != null) {
jenkins.cleanUp();
core/src/main/java/hudson/lifecycle/UnixLifecycle.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class UnixLifecycle extends Lifecycle {
@Override
public void restart() throws IOException, InterruptedException {
Jenkins h = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
Jenkins jenkins = Jenkins.getInstanceOrNull(); // guard against repeated concurrent calls to restart
try {
if (jenkins != null) {
jenkins.cleanUp();
core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
+1 -1
View File
@@ -117,7 +117,7 @@ public class WindowsServiceLifecycle extends Lifecycle {
@Override
public void restart() throws IOException, InterruptedException {
Jenkins jenkins = Jenkins.getInstance();
Jenkins jenkins = Jenkins.getInstanceOrNull();
try {
if (jenkins != null) {
jenkins.cleanUp();