Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
c02e02df
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
c02e02df
编写于
6月 16, 2015
作者:
S
Stephen Connolly
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
prepare for merge
上级
10a88756
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
12 deletion
+15
-12
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/Queue.java
core/src/main/java/hudson/model/Queue.java
+12
-12
未找到文件。
changelog.html
浏览文件 @
c02e02df
...
...
@@ -74,6 +74,9 @@ Upcoming changes</a>
<li
class=
bug
>
Fix several loggers which are identifying as the wrong class.
(
<a
href=
"https://github.com/jenkinsci/jenkins/pull/1651"
>
PR 1651
</a>
)
<li
class=
bug
>
Fix deadlock between hudson.model.Queue and hudson.model.Computer.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-288040"
>
issue 28840
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
<h3><a
name=
v1.617
>
What's new in 1.617
</a>
(2015/06/07)
</h3>
...
...
core/src/main/java/hudson/model/Queue.java
浏览文件 @
c02e02df
...
...
@@ -1179,7 +1179,7 @@ public class Queue extends ResourceController implements Saveable {
}
/**
* Some operations require t
o be performed with t
he {@link Queue} lock held. Use one of these methods rather
* Some operations require the {@link Queue} lock held. Use one of these methods rather
* than locking directly on Queue in order to allow for future refactoring.
*
* @param callable the operation to perform.
...
...
@@ -1220,11 +1220,11 @@ public class Queue extends ResourceController implements Saveable {
}
/**
*
Some operations require to be performed with the {@link Queue} lock held. Use one of these methods rather
*
than locking directly on Queue in order to allow for future refactoring.
*
Invokes the supplied {@link Runnable} if the {@link Queue} lock was obtained without blocking.
*
* @param runnable the operation to perform.
* @return {@code true} if the lock
available and the operation performed.
* @since 1.
FIXME
* @return {@code true} if the lock
was available and the operation was performed.
* @since 1.
618
*/
public
static
boolean
tryWithLock
(
Runnable
runnable
)
{
final
Jenkins
jenkins
=
Jenkins
.
getInstance
();
...
...
@@ -1240,7 +1240,7 @@ public class Queue extends ResourceController implements Saveable {
* Wraps a {@link Runnable} with the {@link Queue} lock held.
*
* @param runnable the operation to wrap.
* @since 1.
FIXME
* @since 1.
618
*/
public
static
Runnable
wrapWithLock
(
Runnable
runnable
)
{
final
Jenkins
jenkins
=
Jenkins
.
getInstance
();
...
...
@@ -1252,7 +1252,7 @@ public class Queue extends ResourceController implements Saveable {
* Wraps a {@link hudson.remoting.Callable} with the {@link Queue} lock held.
*
* @param callable the operation to wrap.
* @since 1.
FIXME
* @since 1.
618
*/
public
static
<
V
,
T
extends
Throwable
>
hudson
.
remoting
.
Callable
<
V
,
T
>
wrapWithLock
(
hudson
.
remoting
.
Callable
<
V
,
T
>
callable
)
{
final
Jenkins
jenkins
=
Jenkins
.
getInstance
();
...
...
@@ -1264,7 +1264,7 @@ public class Queue extends ResourceController implements Saveable {
* Wraps a {@link java.util.concurrent.Callable} with the {@link Queue} lock held.
*
* @param callable the operation to wrap.
* @since 1.
FIXME
* @since 1.
618
*/
public
static
<
V
>
java
.
util
.
concurrent
.
Callable
<
V
>
wrapWithLock
(
java
.
util
.
concurrent
.
Callable
<
V
>
callable
)
{
final
Jenkins
jenkins
=
Jenkins
.
getInstance
();
...
...
@@ -1298,11 +1298,11 @@ public class Queue extends ResourceController implements Saveable {
}
/**
*
Some operations require to be performed with the {@link Queue} lock held. Use one of these methods rather
*
than locking directly on Queue in order to allow for future refactoring.
*
Invokes the supplied {@link Runnable} if the {@link Queue} lock was obtained without blocking.
*
* @param runnable the operation to perform.
* @return {@code true} if the lock
available and the operation performed.
* @since 1.
FIXME
* @return {@code true} if the lock
was available and the operation was performed.
* @since 1.
618
*/
protected
boolean
_tryWithLock
(
Runnable
runnable
)
{
if
(
lock
.
tryLock
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录