Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
08a993d7
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
08a993d7
编写于
2月 12, 2017
作者:
O
Oleg Nenashev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-32820] Fix the last merge issues
上级
579a88d6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
3 addition
and
3 deletion
+3
-3
core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java
core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java
+1
-1
core/src/main/java/hudson/lifecycle/UnixLifecycle.java
core/src/main/java/hudson/lifecycle/UnixLifecycle.java
+1
-1
core/src/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
...c/main/java/hudson/lifecycle/WindowsServiceLifecycle.java
+1
-1
未找到文件。
core/src/main/java/hudson/lifecycle/SolarisSMFLifecycle.java
浏览文件 @
08a993d7
...
...
@@ -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
浏览文件 @
08a993d7
...
...
@@ -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
浏览文件 @
08a993d7
...
...
@@ -117,7 +117,7 @@ public class WindowsServiceLifecycle extends Lifecycle {
@Override
public
void
restart
()
throws
IOException
,
InterruptedException
{
Jenkins
jenkins
=
Jenkins
.
getInstance
();
Jenkins
jenkins
=
Jenkins
.
getInstance
OrNull
();
try
{
if
(
jenkins
!=
null
)
{
jenkins
.
cleanUp
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录