Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
da541716
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,发现更多精彩内容 >>
提交
da541716
编写于
12月 12, 2016
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Handle suppressed exceptions.
上级
106bd3e0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
54 addition
and
7 deletion
+54
-7
core/src/main/java/hudson/Functions.java
core/src/main/java/hudson/Functions.java
+11
-6
core/src/test/java/hudson/FunctionsTest.java
core/src/test/java/hudson/FunctionsTest.java
+43
-1
未找到文件。
core/src/main/java/hudson/Functions.java
浏览文件 @
da541716
...
...
@@ -1453,16 +1453,21 @@ public class Functions {
return
Messages
.
Functions_NoExceptionDetails
();
}
StringBuilder
s
=
new
StringBuilder
();
doPrintStackTrace
(
s
,
t
,
null
);
doPrintStackTrace
(
s
,
t
,
null
,
""
);
return
s
.
toString
();
}
private
static
void
doPrintStackTrace
(
@Nonnull
StringBuilder
s
,
@Nonnull
Throwable
t
,
@CheckForNull
Throwable
higher
)
{
private
static
void
doPrintStackTrace
(
@Nonnull
StringBuilder
s
,
@Nonnull
Throwable
t
,
@CheckForNull
Throwable
higher
,
@Nonnull
String
prefix
)
{
// TODO check if t overrides printStackTrace
// TODO handle suppressed exceptions
Throwable
lower
=
t
.
getCause
();
if
(
lower
!=
null
)
{
doPrintStackTrace
(
s
,
lower
,
t
);
s
.
append
(
"Caused: "
);
doPrintStackTrace
(
s
,
lower
,
t
,
prefix
);
}
for
(
Throwable
suppressed
:
t
.
getSuppressed
())
{
s
.
append
(
prefix
).
append
(
"Also: "
);
doPrintStackTrace
(
s
,
suppressed
,
t
,
prefix
+
"\t"
);
}
if
(
lower
!=
null
)
{
s
.
append
(
prefix
).
append
(
"Caused: "
);
}
String
summary
=
t
.
toString
();
if
(
lower
!=
null
)
{
...
...
@@ -1485,7 +1490,7 @@ public class Functions {
}
}
for
(
int
i
=
0
;
i
<
end
;
i
++)
{
s
.
append
(
"\tat "
).
append
(
trace
[
i
]).
append
(
IOUtils
.
LINE_SEPARATOR
);
s
.
append
(
prefix
).
append
(
"\tat "
).
append
(
trace
[
i
]).
append
(
IOUtils
.
LINE_SEPARATOR
);
}
}
...
...
core/src/test/java/hudson/FunctionsTest.java
浏览文件 @
da541716
...
...
@@ -454,12 +454,54 @@ public class FunctionsTest {
"\tat ......remote call(Native Method)\n"
+
"\tat local.Side.call(Side.java:11)\n"
+
"\tat local.Main.main(Main.java:1)\n"
);
// Suppressed exceptions:
assertPrintThrowable
(
new
Stack
(
"java.lang.IllegalStateException: java.lang.NullPointerException: oops"
,
"p.C.method1:19"
,
"m.Main.main:1"
).
cause
(
new
Stack
(
"java.lang.NullPointerException: oops"
,
"p.C.method2:23"
,
"p.C.method1:17"
,
"m.Main.main:1"
)).
suppressed
(
new
Stack
(
"java.io.IOException: could not close"
,
"p.C.close:99"
,
"p.C.method1:18"
,
"m.Main.main:1"
),
new
Stack
(
"java.io.IOException: java.lang.NullPointerException"
,
"p.C.flush:77"
,
"p.C.method1:18"
,
"m.Main.main:1"
).
cause
(
new
Stack
(
"java.lang.NullPointerException"
,
"p.C.findFlushee:70"
,
"p.C.flush:75"
,
"p.C.method1:18"
,
"m.Main.main:1"
))),
"java.lang.IllegalStateException: java.lang.NullPointerException: oops\n"
+
"\tat p.C.method1(C.java:19)\n"
+
"\tat m.Main.main(Main.java:1)\n"
+
"\tSuppressed: java.io.IOException: could not close\n"
+
"\t\tat p.C.close(C.java:99)\n"
+
"\t\tat p.C.method1(C.java:18)\n"
+
"\t\t... 1 more\n"
+
"\tSuppressed: java.io.IOException: java.lang.NullPointerException\n"
+
"\t\tat p.C.flush(C.java:77)\n"
+
"\t\tat p.C.method1(C.java:18)\n"
+
"\t\t... 1 more\n"
+
"\tCaused by: java.lang.NullPointerException\n"
+
"\t\tat p.C.findFlushee(C.java:70)\n"
+
"\t\tat p.C.flush(C.java:75)\n"
+
"\t\t... 2 more\n"
+
"Caused by: java.lang.NullPointerException: oops\n"
+
"\tat p.C.method2(C.java:23)\n"
+
"\tat p.C.method1(C.java:17)\n"
+
"\t... 1 more\n"
,
"java.lang.NullPointerException: oops\n"
+
"\tat p.C.method2(C.java:23)\n"
+
"\tat p.C.method1(C.java:17)\n"
+
"Also: java.io.IOException: could not close\n"
+
"\t\tat p.C.close(C.java:99)\n"
+
"\t\tat p.C.method1(C.java:18)\n"
+
"Also: java.lang.NullPointerException\n"
+
"\t\tat p.C.findFlushee(C.java:70)\n"
+
"\t\tat p.C.flush(C.java:75)\n"
+
"\tCaused: java.io.IOException\n"
+
"\t\tat p.C.flush(C.java:77)\n"
+
"\t\tat p.C.method1(C.java:18)\n"
+
"Caused: java.lang.IllegalStateException\n"
+
"\tat p.C.method1(C.java:19)\n"
+
"\tat m.Main.main(Main.java:1)\n"
);
}
private
static
void
assertPrintThrowable
(
Throwable
t
,
String
traditional
,
String
custom
)
{
StringWriter
sw
=
new
StringWriter
();
t
.
printStackTrace
(
new
PrintWriter
(
sw
));
assertEquals
(
sw
.
toString
().
replace
(
IOUtils
.
LINE_SEPARATOR
,
"\n"
),
traditional
);
assertEquals
(
Functions
.
printThrowable
(
t
).
replace
(
IOUtils
.
LINE_SEPARATOR
,
"\n"
),
custom
);
String
actual
=
Functions
.
printThrowable
(
t
);
System
.
out
.
println
(
actual
);
assertEquals
(
actual
.
replace
(
IOUtils
.
LINE_SEPARATOR
,
"\n"
),
custom
);
}
private
static
final
class
Stack
extends
Throwable
{
private
static
final
Pattern
LINE
=
Pattern
.
compile
(
"(.+)[.](.+)[.](.+):(\\d+)"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录