Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
e84fd0de
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,发现更多精彩内容 >>
提交
e84fd0de
编写于
10月 05, 2019
作者:
A
Andrea Scarpino
提交者:
Oliver Gondža
2月 13, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
JENKINS-42658: fix NPE when the slave if offline
(cherry picked from commit
10a52c10
)
上级
8921fd77
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
38 addition
and
4 deletion
+38
-4
core/src/main/java/hudson/slaves/SlaveComputer.java
core/src/main/java/hudson/slaves/SlaveComputer.java
+38
-4
未找到文件。
core/src/main/java/hudson/slaves/SlaveComputer.java
浏览文件 @
e84fd0de
...
...
@@ -76,6 +76,7 @@ import org.kohsuke.stapler.export.Exported;
import
org.kohsuke.stapler.interceptor.RequirePOST
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.CheckReturnValue
;
import
javax.annotation.Nonnull
;
import
javax.annotation.OverridingMethodsMustInvokeSuper
;
import
java.io.File
;
...
...
@@ -454,18 +455,27 @@ public class SlaveComputer extends Computer {
/**
* Shows {@link Channel#classLoadingCount}.
* @return Requested value or {@code -1} if the agent is offline.
* @since 1.495
*/
@CheckReturnValue
public
int
getClassLoadingCount
()
throws
IOException
,
InterruptedException
{
if
(
channel
==
null
)
{
return
-
1
;
}
return
channel
.
call
(
new
LoadingCount
(
false
));
}
/**
* Shows {@link Channel#classLoadingPrefetchCacheCount}.
* @return
-1 in case that capability is not supported
* @return
Requested value or {@code -1} in case that capability is not supported or if the agent is offline.
* @since 1.519
*/
@CheckReturnValue
public
int
getClassLoadingPrefetchCacheCount
()
throws
IOException
,
InterruptedException
{
if
(
channel
==
null
)
{
return
-
1
;
}
if
(!
channel
.
remoteCapability
.
supportsPrefetch
())
{
return
-
1
;
}
...
...
@@ -474,25 +484,40 @@ public class SlaveComputer extends Computer {
/**
* Shows {@link Channel#resourceLoadingCount}.
* @return Requested value or {@code -1} if the agent is offline.
* @since 1.495
*/
@CheckReturnValue
public
int
getResourceLoadingCount
()
throws
IOException
,
InterruptedException
{
if
(
channel
==
null
)
{
return
-
1
;
}
return
channel
.
call
(
new
LoadingCount
(
true
));
}
/**
* Shows {@link Channel#classLoadingTime}.
* @return Requested value or {@code -1} if the agent is offline.
* @since 1.495
*/
@CheckReturnValue
public
long
getClassLoadingTime
()
throws
IOException
,
InterruptedException
{
if
(
channel
==
null
)
{
return
-
1
;
}
return
channel
.
call
(
new
LoadingTime
(
false
));
}
/**
* Shows {@link Channel#resourceLoadingTime}.
* @return Requested value or {@code -1} if the agent is offline.
* @since 1.495
*/
@CheckReturnValue
public
long
getResourceLoadingTime
()
throws
IOException
,
InterruptedException
{
if
(
channel
==
null
)
{
return
-
1
;
}
return
channel
.
call
(
new
LoadingTime
(
true
));
}
...
...
@@ -741,7 +766,7 @@ public class SlaveComputer extends Computer {
@Override
public
void
doLaunchSlaveAgent
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
{
checkPermission
(
CONNECT
);
if
(
channel
!=
null
)
{
try
{
req
.
getView
(
this
,
"already-launched.jelly"
).
forward
(
req
,
rsp
);
...
...
@@ -890,27 +915,36 @@ public class SlaveComputer extends Computer {
/**
* Get the agent version
*/
@CheckReturnValue
public
String
getSlaveVersion
()
throws
IOException
,
InterruptedException
{
if
(
channel
==
null
)
{
return
"Unknown (agent is offline)"
;
}
return
channel
.
call
(
new
SlaveVersion
());
}
/**
* Get the OS description.
*/
@CheckReturnValue
public
String
getOSDescription
()
throws
IOException
,
InterruptedException
{
if
(
channel
==
null
)
{
return
"Unknown (agent is offline)"
;
}
return
channel
.
call
(
new
DetectOS
())
?
"Unix"
:
"Windows"
;
}
/**
* Expose real full env vars map from agent for UI presentation
*/
@CheckReturnValue
public
Map
<
String
,
String
>
getEnvVarsFull
()
throws
IOException
,
InterruptedException
{
if
(
getChannel
()
==
null
)
{
if
(
channel
==
null
)
{
Map
<
String
,
String
>
env
=
new
TreeMap
<>
();
env
.
put
(
"N/A"
,
"N/A"
);
return
env
;
}
else
{
return
getChannel
()
.
call
(
new
ListFullEnvironment
());
return
channel
.
call
(
new
ListFullEnvironment
());
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录