Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
fa68f242
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,发现更多精彩内容 >>
提交
fa68f242
编写于
5月 22, 2012
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'pull-478'
上级
1589ec44
ec873540
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
12 deletion
+22
-12
changelog.html
changelog.html
+2
-0
core/src/main/java/hudson/model/ListView.java
core/src/main/java/hudson/model/ListView.java
+19
-11
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+1
-1
未找到文件。
changelog.html
浏览文件 @
fa68f242
...
...
@@ -55,6 +55,8 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
bug
>
Fixed a possible race condition
<li
class=
rfe
>
Matrix custom workspace support is improved to allow configuration builds to share workspace
<li
class=
rfe
>
...
...
core/src/main/java/hudson/model/ListView.java
浏览文件 @
fa68f242
...
...
@@ -24,8 +24,6 @@
*/
package
hudson.model
;
import
com.infradna.tool.bridge_method_injector.BridgeMethodsAdded
;
import
com.infradna.tool.bridge_method_injector.WithBridgeMethods
;
import
hudson.Extension
;
import
hudson.Util
;
import
hudson.model.Descriptor.FormException
;
...
...
@@ -34,12 +32,12 @@ import hudson.util.DescribableList;
import
hudson.util.FormValidation
;
import
hudson.views.ListViewColumn
;
import
hudson.views.ViewJobFilter
;
import
jenkins.model.Jenkins
;
import
org.kohsuke.stapler.DataBoundConstructor
;
import
org.kohsuke.stapler.QueryParameter
;
import
org.kohsuke.stapler.StaplerRequest
;
import
org.kohsuke.stapler.StaplerResponse
;
import
javax.annotation.concurrent.GuardedBy
;
import
javax.servlet.ServletException
;
import
java.io.IOException
;
import
java.util.ArrayList
;
...
...
@@ -60,6 +58,7 @@ public class ListView extends View implements Saveable {
/**
* List of job names. This is what gets serialized.
*/
@GuardedBy
(
"this"
)
/*package*/
final
SortedSet
<
String
>
jobNames
=
new
TreeSet
<
String
>(
CaseInsensitiveComparator
.
INSTANCE
);
private
DescribableList
<
ViewJobFilter
,
Descriptor
<
ViewJobFilter
>>
jobFilters
;
...
...
@@ -134,8 +133,12 @@ public class ListView extends View implements Saveable {
* This method returns a separate copy each time to avoid
* concurrent modification issue.
*/
public
synchronized
List
<
TopLevelItem
>
getItems
()
{
SortedSet
<
String
>
names
=
new
TreeSet
<
String
>(
jobNames
);
public
List
<
TopLevelItem
>
getItems
()
{
SortedSet
<
String
>
names
;
synchronized
(
this
)
{
names
=
new
TreeSet
<
String
>(
jobNames
);
}
if
(
includePattern
!=
null
)
{
for
(
Item
item
:
getOwnerItemGroup
().
getItems
())
{
...
...
@@ -146,6 +149,7 @@ public class ListView extends View implements Saveable {
}
}
Boolean
statusFilter
=
this
.
statusFilter
;
// capture the value to isolate us from concurrent update
List
<
TopLevelItem
>
items
=
new
ArrayList
<
TopLevelItem
>(
names
.
size
());
for
(
String
n
:
names
)
{
TopLevelItem
item
=
getOwnerItemGroup
().
getItem
(
n
);
...
...
@@ -167,7 +171,7 @@ public class ListView extends View implements Saveable {
return
items
;
}
public
boolean
contains
(
TopLevelItem
item
)
{
public
synchronized
boolean
contains
(
TopLevelItem
item
)
{
return
jobNames
.
contains
(
item
.
getName
());
}
...
...
@@ -177,7 +181,9 @@ public class ListView extends View implements Saveable {
* @since 1.389
*/
public
void
add
(
TopLevelItem
item
)
throws
IOException
{
jobNames
.
add
(
item
.
getName
());
synchronized
(
this
)
{
jobNames
.
add
(
item
.
getName
());
}
save
();
}
...
...
@@ -219,10 +225,12 @@ public class ListView extends View implements Saveable {
*/
@Override
protected
void
submit
(
StaplerRequest
req
)
throws
ServletException
,
FormException
,
IOException
{
jobNames
.
clear
();
for
(
TopLevelItem
item
:
getOwnerItemGroup
().
getItems
())
{
if
(
req
.
getParameter
(
item
.
getName
())!=
null
)
jobNames
.
add
(
item
.
getName
());
synchronized
(
this
)
{
jobNames
.
clear
();
for
(
TopLevelItem
item
:
getOwnerItemGroup
().
getItems
())
{
if
(
req
.
getParameter
(
item
.
getName
())!=
null
)
jobNames
.
add
(
item
.
getName
());
}
}
if
(
req
.
getParameter
(
"useincluderegex"
)
!=
null
)
{
...
...
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
fa68f242
...
...
@@ -1367,7 +1367,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
* Gets the read-only list of all {@link View}s.
*/
@Exported
public
synchronized
Collection
<
View
>
getViews
()
{
public
Collection
<
View
>
getViews
()
{
return
viewGroupMixIn
.
getViews
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录