Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
4540ba71
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
4540ba71
编写于
6月 10, 2015
作者:
S
Stephen Connolly
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1730 from stephenc/jenkins-28690
[FIXED JENKINS-28690] Deadlock in hudson.model.Executor
上级
f628e399
ddb0a472
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
2 deletion
+9
-2
core/src/main/java/hudson/model/Executor.java
core/src/main/java/hudson/model/Executor.java
+9
-2
未找到文件。
core/src/main/java/hudson/model/Executor.java
浏览文件 @
4540ba71
...
...
@@ -205,7 +205,14 @@ public class Executor extends Thread implements ModelObject {
}
public
Result
abortResult
()
{
lock
.
readLock
().
lock
();
// this method is almost always called as a result of the current thread being interrupted
// as a result we need to clean the interrupt flag so that the lock's lock method doesn't
// get confused and think it was interrupted while awaiting the lock
Thread
.
interrupted
();
// we need to use a write lock as we may be repeatedly interrupted while processing and
// we need the same lock as used in void interrupt(Result,boolean,CauseOfInterruption...)
// JENKINS-28690
lock
.
writeLock
().
lock
();
try
{
Result
r
=
interruptStatus
;
if
(
r
==
null
)
r
=
...
...
@@ -213,7 +220,7 @@ public class Executor extends Thread implements ModelObject {
return
r
;
}
finally
{
lock
.
read
Lock
().
unlock
();
lock
.
write
Lock
().
unlock
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录