Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
78e09522
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,发现更多精彩内容 >>
提交
78e09522
编写于
3月 07, 2014
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
getParameterizedJobMixIn turned out to be unnecessary.
上级
9f19ae91
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
7 deletion
+5
-7
core/src/main/java/hudson/model/AbstractProject.java
core/src/main/java/hudson/model/AbstractProject.java
+1
-1
core/src/main/java/hudson/model/ParametersDefinitionProperty.java
.../main/java/hudson/model/ParametersDefinitionProperty.java
+1
-1
core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
+3
-5
未找到文件。
core/src/main/java/hudson/model/AbstractProject.java
浏览文件 @
78e09522
...
...
@@ -287,7 +287,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
return
buildMixIn
;
}
@Override
public
synchronized
ParameterizedJobMixIn
<
P
,
R
>
getParameterizedJobMixIn
()
{
private
synchronized
ParameterizedJobMixIn
<
P
,
R
>
getParameterizedJobMixIn
()
{
if
(
parameterizedJobMixIn
==
null
)
{
parameterizedJobMixIn
=
new
ParameterizedJobMixIn
<
P
,
R
>()
{
@SuppressWarnings
(
"unchecked"
)
// untypable
...
...
core/src/main/java/hudson/model/ParametersDefinitionProperty.java
浏览文件 @
78e09522
...
...
@@ -175,7 +175,7 @@ public class ParametersDefinitionProperty extends JobProperty<Job<?, ?>>
if
(
delay
==
null
)
delay
=
new
TimeDuration
(
getJob
().
getQuietPeriod
());
Jenkins
.
getInstance
().
getQueue
().
schedule
(
getJob
(),
delay
.
getTime
(),
new
ParametersAction
(
values
),
getJob
().
getParameterizedJobMixIn
().
getBuildCause
(
req
));
getJob
(),
delay
.
getTime
(),
new
ParametersAction
(
values
),
ParameterizedJobMixIn
.
getBuildCause
(
getJob
(),
req
));
if
(
requestWantsJson
(
req
))
{
rsp
.
setContentType
(
"application/json"
);
...
...
core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
浏览文件 @
78e09522
...
...
@@ -171,7 +171,7 @@ public abstract class ParameterizedJobMixIn<JobT extends Job<JobT, RunT> & Param
throw
HttpResponses
.
error
(
SC_INTERNAL_SERVER_ERROR
,
new
IOException
(
asJob
().
getFullName
()
+
" is not buildable"
));
}
Queue
.
Item
item
=
Jenkins
.
getInstance
().
getQueue
().
schedule2
(
asJob
(),
delay
.
getTime
(),
getBuildCause
(
req
)).
getItem
();
Queue
.
Item
item
=
Jenkins
.
getInstance
().
getQueue
().
schedule2
(
asJob
(),
delay
.
getTime
(),
getBuildCause
(
asJob
(),
req
)).
getItem
();
if
(
item
!=
null
)
{
rsp
.
sendRedirect
(
SC_CREATED
,
req
.
getContextPath
()
+
'/'
+
item
.
getUrl
());
}
else
{
...
...
@@ -223,10 +223,10 @@ public abstract class ParameterizedJobMixIn<JobT extends Job<JobT, RunT> & Param
* Computes the build cause, using RemoteCause or UserCause as appropriate.
*/
@Restricted
(
NoExternalUse
.
class
)
public
final
CauseAction
getBuildCause
(
StaplerRequest
req
)
{
public
static
final
CauseAction
getBuildCause
(
ParameterizedJob
job
,
StaplerRequest
req
)
{
Cause
cause
;
@SuppressWarnings
(
"deprecation"
)
hudson
.
model
.
BuildAuthorizationToken
authToken
=
asJob
()
.
getAuthToken
();
hudson
.
model
.
BuildAuthorizationToken
authToken
=
job
.
getAuthToken
();
if
(
authToken
!=
null
&&
authToken
.
getToken
()
!=
null
&&
req
.
getParameter
(
"token"
)
!=
null
)
{
// Optional additional cause text when starting via token
String
causeText
=
req
.
getParameter
(
"cause"
);
...
...
@@ -251,8 +251,6 @@ public abstract class ParameterizedJobMixIn<JobT extends Job<JobT, RunT> & Param
*/
public
interface
ParameterizedJob
extends
hudson
.
model
.
Queue
.
Task
{
ParameterizedJobMixIn
<?,?>
getParameterizedJobMixIn
();
@SuppressWarnings
(
"deprecation"
)
@CheckForNull
hudson
.
model
.
BuildAuthorizationToken
getAuthToken
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录