Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
0ba90615
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,发现更多精彩内容 >>
提交
0ba90615
编写于
9月 20, 2016
作者:
O
Oliver Gondža
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Present stacktrace when throwable attached to Descriptor.FormException
上级
38de41d1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
35 addition
and
1 deletion
+35
-1
core/src/main/java/hudson/model/Descriptor.java
core/src/main/java/hudson/model/Descriptor.java
+1
-1
core/src/main/java/hudson/model/Failure.java
core/src/main/java/hudson/model/Failure.java
+8
-0
test/src/test/java/hudson/model/DescriptorTest.java
test/src/test/java/hudson/model/DescriptorTest.java
+26
-0
未找到文件。
core/src/main/java/hudson/model/Descriptor.java
浏览文件 @
0ba90615
...
...
@@ -1144,7 +1144,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable {
.
generateResponse
(
req
,
rsp
,
node
);
}
else
{
// for now, we can't really use the field name that caused the problem.
new
Failure
(
getMessage
()).
generateResponse
(
req
,
rsp
,
node
);
new
Failure
(
getMessage
()).
generateResponse
(
req
,
rsp
,
node
,
getCause
()
);
}
}
}
...
...
core/src/main/java/hudson/model/Failure.java
浏览文件 @
0ba90615
...
...
@@ -28,6 +28,7 @@ import org.kohsuke.stapler.HttpResponse;
import
org.kohsuke.stapler.StaplerRequest
;
import
org.kohsuke.stapler.StaplerResponse
;
import
javax.annotation.Nullable
;
import
javax.servlet.ServletException
;
import
java.io.IOException
;
...
...
@@ -54,6 +55,13 @@ public class Failure extends RuntimeException implements HttpResponse {
this
.
pre
=
pre
;
}
public
void
generateResponse
(
StaplerRequest
req
,
StaplerResponse
rsp
,
Object
node
,
@Nullable
Throwable
throwable
)
throws
IOException
,
ServletException
{
if
(
throwable
!=
null
)
{
req
.
setAttribute
(
"exception"
,
throwable
);
}
generateResponse
(
req
,
rsp
,
node
);
}
public
void
generateResponse
(
StaplerRequest
req
,
StaplerResponse
rsp
,
Object
node
)
throws
IOException
,
ServletException
{
req
.
setAttribute
(
"message"
,
getMessage
());
if
(
pre
)
...
...
test/src/test/java/hudson/model/DescriptorTest.java
浏览文件 @
0ba90615
...
...
@@ -24,6 +24,7 @@
package
hudson.model
;
import
com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException
;
import
hudson.Launcher
;
import
hudson.model.Descriptor.PropertyType
;
import
hudson.tasks.BuildStepDescriptor
;
...
...
@@ -32,9 +33,14 @@ import hudson.tasks.Shell;
import
java.io.IOException
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.concurrent.Callable
;
import
jenkins.model.Jenkins
;
import
net.sf.json.JSONObject
;
import
static
org
.
hamcrest
.
Matchers
.
containsString
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Ignore
;
import
org.junit.Rule
;
import
org.junit.Test
;
...
...
@@ -42,6 +48,7 @@ import org.jvnet.hudson.test.Issue;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.TestExtension
;
import
org.kohsuke.stapler.DataBoundConstructor
;
import
org.kohsuke.stapler.Stapler
;
import
org.kohsuke.stapler.StaplerRequest
;
@SuppressWarnings
({
"unchecked"
,
"rawtypes"
})
...
...
@@ -195,4 +202,23 @@ public class DescriptorTest {
@TestExtension
(
"nestedDescribableSharingClass"
)
public
static
class
DescriptorImpl
extends
Descriptor
<
Builder
>
{}
}
@Test
public
void
presentStacktraceFromFormException
()
throws
Exception
{
NullPointerException
cause
=
new
NullPointerException
();
final
Descriptor
.
FormException
fe
=
new
Descriptor
.
FormException
(
"My Message"
,
cause
,
"fake"
);
try
{
rule
.
executeOnServer
(
new
Callable
<
Void
>()
{
@Override
public
Void
call
()
throws
Exception
{
fe
.
generateResponse
(
Stapler
.
getCurrentRequest
(),
Stapler
.
getCurrentResponse
(),
Jenkins
.
getInstance
());
return
null
;
}
});
fail
();
}
catch
(
FailingHttpStatusCodeException
ex
)
{
String
response
=
ex
.
getResponse
().
getContentAsString
();
assertThat
(
response
,
containsString
(
fe
.
getMessage
()));
assertThat
(
response
,
containsString
(
cause
.
getClass
().
getCanonicalName
()));
assertThat
(
response
,
containsString
(
getClass
().
getCanonicalName
()));
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录