Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
bd8091cf
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,发现更多精彩内容 >>
提交
bd8091cf
编写于
2月 20, 2019
作者:
J
Josh Soref
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Drop useless local variables
上级
95c8e715
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
17 addition
and
33 deletion
+17
-33
core/src/main/java/hudson/FilePath.java
core/src/main/java/hudson/FilePath.java
+1
-2
core/src/main/java/hudson/PluginFirstClassLoader.java
core/src/main/java/hudson/PluginFirstClassLoader.java
+4
-8
core/src/main/java/hudson/PluginManager.java
core/src/main/java/hudson/PluginManager.java
+1
-2
core/src/main/java/hudson/model/BuildAuthorizationToken.java
core/src/main/java/hudson/model/BuildAuthorizationToken.java
+1
-2
core/src/main/java/hudson/model/ParametersAction.java
core/src/main/java/hudson/model/ParametersAction.java
+1
-2
core/src/main/java/hudson/tools/BatchCommandInstaller.java
core/src/main/java/hudson/tools/BatchCommandInstaller.java
+1
-2
core/src/main/java/hudson/tools/CommandInstaller.java
core/src/main/java/hudson/tools/CommandInstaller.java
+1
-2
core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
.../src/main/java/hudson/tools/DownloadFromUrlInstaller.java
+1
-2
core/src/main/java/hudson/util/ProcessTree.java
core/src/main/java/hudson/util/ProcessTree.java
+1
-2
core/src/main/java/jenkins/model/NewViewLink.java
core/src/main/java/jenkins/model/NewViewLink.java
+1
-2
core/src/main/java/jenkins/model/lazy/Boundary.java
core/src/main/java/jenkins/model/lazy/Boundary.java
+2
-3
core/src/main/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor.java
...ecurity/apitoken/LegacyApiTokenAdministrativeMonitor.java
+2
-4
未找到文件。
core/src/main/java/hudson/FilePath.java
浏览文件 @
bd8091cf
...
...
@@ -1929,8 +1929,7 @@ public final class FilePath implements Serializable {
}
catch
(
BuildException
x
)
{
throw
new
IOException
(
x
.
getMessage
());
}
String
[]
files
=
ds
.
getIncludedFiles
();
return
files
;
return
ds
.
getIncludedFiles
();
}
/**
...
...
core/src/main/java/hudson/PluginFirstClassLoader.java
浏览文件 @
bd8091cf
...
...
@@ -80,29 +80,25 @@ public class PluginFirstClassLoader
protected
Enumeration
findResources
(
String
arg0
,
boolean
arg1
)
throws
IOException
{
Enumeration
enu
=
super
.
findResources
(
arg0
,
arg1
);
return
enu
;
return
super
.
findResources
(
arg0
,
arg1
);
}
@Override
protected
Enumeration
findResources
(
String
name
)
throws
IOException
{
Enumeration
enu
=
super
.
findResources
(
name
);
return
enu
;
return
super
.
findResources
(
name
);
}
@Override
public
URL
getResource
(
String
arg0
)
{
URL
url
=
super
.
getResource
(
arg0
);
return
url
;
return
super
.
getResource
(
arg0
);
}
@Override
public
InputStream
getResourceAsStream
(
String
name
)
{
InputStream
is
=
super
.
getResourceAsStream
(
name
);
return
is
;
return
super
.
getResourceAsStream
(
name
);
}
}
core/src/main/java/hudson/PluginManager.java
浏览文件 @
bd8091cf
...
...
@@ -1045,8 +1045,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
URL
res
=
cl
.
findResource
(
PluginWrapper
.
MANIFEST_FILENAME
);
if
(
res
!=
null
)
{
in
=
getBundledJpiManifestStream
(
res
);
Manifest
manifest
=
new
Manifest
(
in
);
return
manifest
;
return
new
Manifest
(
in
);
}
}
finally
{
Util
.
closeAndLogFailures
(
in
,
LOGGER
,
PluginWrapper
.
MANIFEST_FILENAME
,
bundledJpi
.
toString
());
...
...
core/src/main/java/hudson/model/BuildAuthorizationToken.java
浏览文件 @
bd8091cf
...
...
@@ -64,8 +64,7 @@ public final class BuildAuthorizationToken {
}
@Deprecated
public
static
void
checkPermission
(
AbstractProject
<?,?>
project
,
BuildAuthorizationToken
token
,
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
{
Job
<?,?>
j
=
project
;
checkPermission
(
j
,
token
,
req
,
rsp
);
checkPermission
((
Job
<?,?>)
project
,
token
,
req
,
rsp
);
}
public
static
void
checkPermission
(
Job
<?,?>
project
,
BuildAuthorizationToken
token
,
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
{
...
...
core/src/main/java/hudson/model/ParametersAction.java
浏览文件 @
bd8091cf
...
...
@@ -268,8 +268,7 @@ public class ParametersAction implements RunAction2, Iterable<ParameterValue>, Q
@Nonnull
public
ParametersAction
merge
(
@CheckForNull
ParametersAction
overrides
)
{
if
(
overrides
==
null
)
{
ParametersAction
parametersAction
=
new
ParametersAction
(
parameters
,
this
.
safeParameters
);
return
parametersAction
;
return
new
ParametersAction
(
parameters
,
this
.
safeParameters
);
}
ParametersAction
parametersAction
=
createUpdated
(
overrides
.
parameters
);
Set
<
String
>
safe
=
new
TreeSet
<>();
...
...
core/src/main/java/hudson/tools/BatchCommandInstaller.java
浏览文件 @
bd8091cf
...
...
@@ -50,8 +50,7 @@ public class BatchCommandInstaller extends AbstractCommandInstaller {
@Override
public
String
[]
getCommandCall
(
FilePath
script
)
{
String
[]
cmd
=
{
"cmd"
,
"/c"
,
"call"
,
script
.
getRemote
()};
return
cmd
;
return
new
String
[]{
"cmd"
,
"/c"
,
"call"
,
script
.
getRemote
()};
}
private
Object
readResolve
()
throws
ObjectStreamException
{
...
...
core/src/main/java/hudson/tools/CommandInstaller.java
浏览文件 @
bd8091cf
...
...
@@ -49,8 +49,7 @@ public class CommandInstaller extends AbstractCommandInstaller {
@Override
public
String
[]
getCommandCall
(
FilePath
script
)
{
String
[]
cmd
=
{
"sh"
,
"-e"
,
script
.
getRemote
()};
return
cmd
;
return
new
String
[]{
"sh"
,
"-e"
,
script
.
getRemote
()};
}
private
Object
readResolve
()
throws
ObjectStreamException
{
...
...
core/src/main/java/hudson/tools/DownloadFromUrlInstaller.java
浏览文件 @
bd8091cf
...
...
@@ -192,9 +192,8 @@ public abstract class DownloadFromUrlInstaller extends ToolInstaller {
ToolInstallerList
toolInstallerList
=
new
ToolInstallerList
();
toolInstallerList
.
list
=
new
ToolInstallerEntry
[
reducedToolEntries
.
size
()];
reducedToolEntries
.
toArray
(
toolInstallerList
.
list
);
JSONObject
reducedToolEntriesJsonList
=
JSONObject
.
fromObject
(
toolInstallerList
);
//return the list with no duplicates
return
reducedToolEntriesJsonList
;
return
JSONObject
.
fromObject
(
toolInstallerList
)
;
}
/**
...
...
core/src/main/java/hudson/util/ProcessTree.java
浏览文件 @
bd8091cf
...
...
@@ -873,8 +873,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
JAVA_9_PROCESSHANDLE_DESTROY
=
null
;
}
}
catch
(
ClassNotFoundException
|
NoSuchFieldException
|
NoSuchMethodException
e
)
{
LinkageError
x
=
new
LinkageError
(
"Cannot initialize reflection for Unix Processes"
,
e
);
throw
x
;
throw
new
LinkageError
(
"Cannot initialize reflection for Unix Processes"
,
e
);
}
}
...
...
core/src/main/java/jenkins/model/NewViewLink.java
浏览文件 @
bd8091cf
...
...
@@ -44,8 +44,7 @@ public class NewViewLink extends TransientViewActionFactory {
@Override
public
String
getUrlName
()
{
String
urlName
=
Jenkins
.
getInstance
().
getRootUrl
()
+
URL_NAME
;
return
urlName
;
return
Jenkins
.
getInstance
().
getRootUrl
()
+
URL_NAME
;
}
private
boolean
hasPermission
(
View
view
)
{
...
...
core/src/main/java/jenkins/model/lazy/Boundary.java
浏览文件 @
bd8091cf
...
...
@@ -54,10 +54,9 @@ enum Boundary {
* Computes the boundary value.
*/
public
int
apply
(
int
binarySearchOutput
)
{
int
r
=
binarySearchOutput
;
if
(
r
>=
0
)
return
r
+
offsetOfExactMatch
;
// if we had some x_i==p
if
(
binarySearchOutput
>=
0
)
return
binarySearchOutput
+
offsetOfExactMatch
;
// if we had some x_i==p
int
ip
=
-(
r
+
1
);
int
ip
=
-(
binarySearchOutput
+
1
);
return
ip
+
offsetOfInsertionPoint
;
}
}
core/src/main/java/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor.java
浏览文件 @
bd8091cf
...
...
@@ -92,8 +92,7 @@ public class LegacyApiTokenAdministrativeMonitor extends AdministrativeMonitor {
@Restricted
(
NoExternalUse
.
class
)
public
@Nullable
ApiTokenStore
.
HashedToken
getLegacyTokenOf
(
@Nonnull
User
user
)
{
ApiTokenProperty
apiTokenProperty
=
user
.
getProperty
(
ApiTokenProperty
.
class
);
ApiTokenStore
.
HashedToken
legacyToken
=
apiTokenProperty
.
getTokenStore
().
getLegacyToken
();
return
legacyToken
;
return
apiTokenProperty
.
getTokenStore
().
getLegacyToken
();
}
// used by Jelly view
...
...
@@ -102,8 +101,7 @@ public class LegacyApiTokenAdministrativeMonitor extends AdministrativeMonitor {
ApiTokenProperty
apiTokenProperty
=
user
.
getProperty
(
ApiTokenProperty
.
class
);
if
(
legacyToken
!=
null
)
{
ApiTokenStats
.
SingleTokenStats
legacyStats
=
apiTokenProperty
.
getTokenStats
().
findTokenStatsById
(
legacyToken
.
getUuid
());
ApiTokenProperty
.
TokenInfoAndStats
tokenInfoAndStats
=
new
ApiTokenProperty
.
TokenInfoAndStats
(
legacyToken
,
legacyStats
);
return
tokenInfoAndStats
;
return
new
ApiTokenProperty
.
TokenInfoAndStats
(
legacyToken
,
legacyStats
);
}
// in case the legacy token was revoked during the request
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录