Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
3f8fc4e2
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,发现更多精彩内容 >>
提交
3f8fc4e2
编写于
6月 02, 2014
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-23277] Better diagnosis for an NPE probably involving cloud slaves.
上级
148251f9
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
17 addition
and
5 deletion
+17
-5
core/src/main/java/hudson/model/AbstractBuild.java
core/src/main/java/hudson/model/AbstractBuild.java
+13
-2
core/src/main/java/hudson/model/Executor.java
core/src/main/java/hudson/model/Executor.java
+4
-3
未找到文件。
core/src/main/java/hudson/model/AbstractBuild.java
浏览文件 @
3f8fc4e2
...
@@ -87,6 +87,7 @@ import javax.annotation.CheckForNull;
...
@@ -87,6 +87,7 @@ import javax.annotation.CheckForNull;
import
org.kohsuke.stapler.interceptor.RequirePOST
;
import
org.kohsuke.stapler.interceptor.RequirePOST
;
import
static
java
.
util
.
logging
.
Level
.
WARNING
;
import
static
java
.
util
.
logging
.
Level
.
WARNING
;
import
javax.annotation.Nonnull
;
import
jenkins.model.lazy.BuildReference
;
import
jenkins.model.lazy.BuildReference
;
import
jenkins.model.lazy.LazyBuildMixIn
;
import
jenkins.model.lazy.LazyBuildMixIn
;
...
@@ -435,9 +436,19 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
...
@@ -435,9 +436,19 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
/**
/**
* Returns the current {@link Node} on which we are building.
* Returns the current {@link Node} on which we are building.
* @throws IllegalStateException if that cannot be determined
*/
*/
protected
final
Node
getCurrentNode
()
{
protected
final
@Nonnull
Node
getCurrentNode
()
throws
IllegalStateException
{
return
Executor
.
currentExecutor
().
getOwner
().
getNode
();
Executor
exec
=
Executor
.
currentExecutor
();
if
(
exec
==
null
)
{
throw
new
IllegalStateException
(
"not being called from an executor thread"
);
}
Computer
c
=
exec
.
getOwner
();
Node
node
=
c
.
getNode
();
if
(
node
==
null
)
{
throw
new
IllegalStateException
(
"no longer a configured node for "
+
c
.
getName
());
}
return
node
;
}
}
public
Launcher
getLauncher
()
{
public
Launcher
getLauncher
()
{
...
...
core/src/main/java/hudson/model/Executor.java
浏览文件 @
3f8fc4e2
...
@@ -59,6 +59,7 @@ import java.util.logging.Logger;
...
@@ -59,6 +59,7 @@ import java.util.logging.Logger;
import
static
hudson
.
model
.
queue
.
Executables
.*;
import
static
hudson
.
model
.
queue
.
Executables
.*;
import
static
java
.
util
.
logging
.
Level
.*;
import
static
java
.
util
.
logging
.
Level
.*;
import
javax.annotation.CheckForNull
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
/**
/**
...
@@ -70,7 +71,7 @@ import javax.annotation.CheckForNull;
...
@@ -70,7 +71,7 @@ import javax.annotation.CheckForNull;
*/
*/
@ExportedBean
@ExportedBean
public
class
Executor
extends
Thread
implements
ModelObject
{
public
class
Executor
extends
Thread
implements
ModelObject
{
protected
final
Computer
owner
;
protected
final
@Nonnull
Computer
owner
;
private
final
Queue
queue
;
private
final
Queue
queue
;
private
long
startTime
;
private
long
startTime
;
...
@@ -111,7 +112,7 @@ public class Executor extends Thread implements ModelObject {
...
@@ -111,7 +112,7 @@ public class Executor extends Thread implements ModelObject {
*/
*/
private
final
List
<
CauseOfInterruption
>
causes
=
new
Vector
<
CauseOfInterruption
>();
private
final
List
<
CauseOfInterruption
>
causes
=
new
Vector
<
CauseOfInterruption
>();
public
Executor
(
Computer
owner
,
int
n
)
{
public
Executor
(
@Nonnull
Computer
owner
,
int
n
)
{
super
(
"Executor #"
+
n
+
" for "
+
owner
.
getDisplayName
());
super
(
"Executor #"
+
n
+
" for "
+
owner
.
getDisplayName
());
this
.
owner
=
owner
;
this
.
owner
=
owner
;
this
.
queue
=
Jenkins
.
getInstance
().
getQueue
();
this
.
queue
=
Jenkins
.
getInstance
().
getQueue
();
...
@@ -534,7 +535,7 @@ public class Executor extends Thread implements ModelObject {
...
@@ -534,7 +535,7 @@ public class Executor extends Thread implements ModelObject {
return
e
!=
null
&&
Tasks
.
getOwnerTaskOf
(
getParentOf
(
e
)).
hasAbortPermission
();
return
e
!=
null
&&
Tasks
.
getOwnerTaskOf
(
getParentOf
(
e
)).
hasAbortPermission
();
}
}
public
Computer
getOwner
()
{
public
@Nonnull
Computer
getOwner
()
{
return
owner
;
return
owner
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录