Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
bdbac284
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,发现更多精彩内容 >>
提交
bdbac284
编写于
11月 11, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-20415] Lack of type safety in JENKINS-20143 fix sometimes caused CCEs.
上级
2a355129
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
24 addition
and
6 deletion
+24
-6
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/ListView.java
core/src/main/java/hudson/model/ListView.java
+4
-6
test/src/test/java/hudson/model/ListViewTest.java
test/src/test/java/hudson/model/ListViewTest.java
+17
-0
未找到文件。
changelog.html
浏览文件 @
bdbac284
...
...
@@ -69,6 +69,9 @@ Upcoming changes</a>
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-20191"
>
issue 20191
</a>
)
<li
class=
rfe
>
Collect and report JVM crash dump files to assist trouble-shooting
<li
class=
bug
>
<code>
ClassCastException
</code>
s sometimes shown from views set to be recursive.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-20415"
>
issue 20415
</a>
)
<li
class=
rfe
>
Show different “up” link for jobs in folders.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-20106"
>
issue 20106
</a>
)
...
...
core/src/main/java/hudson/model/ListView.java
浏览文件 @
bdbac284
...
...
@@ -186,14 +186,12 @@ public class ListView extends View implements Saveable {
}
private
List
<
TopLevelItem
>
expand
(
Collection
<
TopLevelItem
>
items
,
List
<
TopLevelItem
>
allItems
)
{
for
(
Item
item
:
items
)
{
for
(
TopLevel
Item
item
:
items
)
{
if
(
item
instanceof
ItemGroup
)
{
ItemGroup
<
TopLevelItem
>
ig
=
(
ItemGroup
<
TopLevelItem
>)
item
;
expand
(
ig
.
getItems
(),
allItems
);
}
if
(
item
instanceof
TopLevelItem
)
{
allItems
.
add
((
TopLevelItem
)
item
);
ItemGroup
<?
extends
Item
>
ig
=
(
ItemGroup
<?
extends
Item
>)
item
;
expand
(
Util
.
filter
(
ig
.
getItems
(),
TopLevelItem
.
class
),
allItems
);
}
allItems
.
add
(
item
);
}
return
allItems
;
}
...
...
test/src/test/java/hudson/model/ListViewTest.java
浏览文件 @
bdbac284
...
...
@@ -40,6 +40,10 @@ import org.xml.sax.SAXException;
import
com.gargoylesoftware.htmlunit.html.HtmlAnchor
;
import
com.gargoylesoftware.htmlunit.html.HtmlPage
;
import
hudson.matrix.AxisList
;
import
hudson.matrix.MatrixProject
;
import
hudson.matrix.TextAxis
;
import
java.util.Collections
;
public
class
ListViewTest
{
...
...
@@ -95,4 +99,17 @@ public class ListViewTest {
webClient
.
getPage
(
top
,
link
.
getHrefAttribute
());
}
@Bug
(
20415
)
@Test
public
void
nonTopLevelItemGroup
()
throws
Exception
{
MatrixProject
mp
=
j
.
createMatrixProject
();
mp
.
setAxes
(
new
AxisList
(
new
TextAxis
(
"axis"
,
"one"
,
"two"
)));
assertEquals
(
2
,
mp
.
getItems
().
size
());
ListView
v
=
new
ListView
(
"v"
);
j
.
jenkins
.
addView
(
v
);
v
.
setIncludeRegex
(
".*"
);
v
.
setRecurse
(
true
);
// Note: did not manage to reproduce CCE until I changed expand to use ‘for (TopLevelItem item : items)’ rather than ‘for (Item item : items)’; perhaps a compiler-specific issue?
assertEquals
(
Collections
.
singletonList
(
mp
),
v
.
getItems
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录