Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
71d7562d
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,发现更多精彩内容 >>
提交
71d7562d
编写于
4月 04, 2017
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into SSH-CLI-JENKINS-41745
上级
9812db70
df6528e2
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
36 addition
and
11 deletion
+36
-11
cli/src/main/java/hudson/cli/CLI.java
cli/src/main/java/hudson/cli/CLI.java
+4
-0
cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
+1
-2
core/src/main/java/hudson/model/Descriptor.java
core/src/main/java/hudson/model/Descriptor.java
+2
-1
core/src/main/java/hudson/tasks/ArtifactArchiver.java
core/src/main/java/hudson/tasks/ArtifactArchiver.java
+6
-2
core/src/main/java/hudson/util/XStream2.java
core/src/main/java/hudson/util/XStream2.java
+10
-3
core/src/main/java/hudson/util/jna/Advapi32.java
core/src/main/java/hudson/util/jna/Advapi32.java
+4
-0
core/src/main/java/hudson/util/jna/SHELLEXECUTEINFO.java
core/src/main/java/hudson/util/jna/SHELLEXECUTEINFO.java
+3
-0
core/src/main/java/hudson/util/jna/WINBASE.java
core/src/main/java/hudson/util/jna/WINBASE.java
+3
-0
core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties
...ources/hudson/util/HudsonIsRestarting/index_es.properties
+1
-1
core/src/main/resources/lib/form/serverTcpPort_es.properties
core/src/main/resources/lib/form/serverTcpPort_es.properties
+2
-2
未找到文件。
cli/src/main/java/hudson/cli/CLI.java
浏览文件 @
71d7562d
...
...
@@ -229,6 +229,10 @@ public class CLI implements AutoCloseable {
rsp
.
write
(
ch
);
}
String
head
=
new
BufferedReader
(
new
StringReader
(
rsp
.
toString
(
"ISO-8859-1"
))).
readLine
();
if
(
head
==
null
)
{
throw
new
IOException
(
"Unexpected empty response"
);
}
if
(!(
head
.
startsWith
(
"HTTP/1.0 200 "
)
||
head
.
startsWith
(
"HTTP/1.1 200 "
)))
{
s
.
close
();
LOGGER
.
log
(
Level
.
SEVERE
,
"Failed to tunnel the CLI port through the HTTP proxy. Falling back to HTTP."
);
...
...
cli/src/main/java/hudson/cli/FullDuplexHttpStream.java
浏览文件 @
71d7562d
...
...
@@ -137,8 +137,7 @@ public class FullDuplexHttpStream {
if
(
authorization
!=
null
)
{
con
.
addRequestProperty
(
"Authorization"
,
authorization
);
}
try
{
BufferedReader
reader
=
new
BufferedReader
(
new
InputStreamReader
(
con
.
getInputStream
()));
try
(
BufferedReader
reader
=
new
BufferedReader
(
new
InputStreamReader
(
con
.
getInputStream
())))
{
String
line
=
reader
.
readLine
();
String
nextLine
=
reader
.
readLine
();
if
(
nextLine
!=
null
)
{
...
...
core/src/main/java/hudson/model/Descriptor.java
浏览文件 @
71d7562d
...
...
@@ -78,6 +78,7 @@ import java.beans.Introspector;
import
java.util.IdentityHashMap
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
import
javax.annotation.Nullable
;
/**
* Metadata about a configurable instance.
...
...
@@ -563,7 +564,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable,
* Signals a problem in the submitted form.
* @since 1.145
*/
public
T
newInstance
(
@
CheckForNull
StaplerRequest
req
,
@Nonnull
JSONObject
formData
)
throws
FormException
{
public
T
newInstance
(
@
Nullable
StaplerRequest
req
,
@Nonnull
JSONObject
formData
)
throws
FormException
{
try
{
Method
m
=
getClass
().
getMethod
(
"newInstance"
,
StaplerRequest
.
class
);
...
...
core/src/main/java/hudson/tasks/ArtifactArchiver.java
浏览文件 @
71d7562d
...
...
@@ -23,6 +23,7 @@
*/
package
hudson.tasks
;
import
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
;
import
hudson.FilePath
;
import
jenkins.MasterToSlaveFileCallable
;
import
hudson.Launcher
;
...
...
@@ -139,6 +140,8 @@ public class ArtifactArchiver extends Recorder implements SimpleBuildStep {
}
// Backwards compatibility for older builds
@SuppressFBWarnings
(
value
=
"RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"
,
justification
=
"Null checks in readResolve are valid since we deserialize and upgrade objects"
)
public
Object
readResolve
()
{
if
(
allowEmptyArchive
==
null
)
{
this
.
allowEmptyArchive
=
SystemProperties
.
getBoolean
(
ArtifactArchiver
.
class
.
getName
()+
".warnOnEmpty"
);
...
...
@@ -226,7 +229,8 @@ public class ArtifactArchiver extends Recorder implements SimpleBuildStep {
return
;
}
if
(
onlyIfSuccessful
&&
build
.
getResult
()
!=
null
&&
build
.
getResult
().
isWorseThan
(
Result
.
UNSTABLE
))
{
Result
result
=
build
.
getResult
();
if
(
onlyIfSuccessful
&&
result
!=
null
&&
result
.
isWorseThan
(
Result
.
UNSTABLE
))
{
listener
.
getLogger
().
println
(
Messages
.
ArtifactArchiver_SkipBecauseOnlyIfSuccessful
());
return
;
}
...
...
@@ -242,7 +246,7 @@ public class ArtifactArchiver extends Recorder implements SimpleBuildStep {
new
Fingerprinter
(
artifacts
).
perform
(
build
,
ws
,
launcher
,
listener
);
}
}
else
{
Result
result
=
build
.
getResult
();
result
=
build
.
getResult
();
if
(
result
!=
null
&&
result
.
isBetterOrEqualTo
(
Result
.
UNSTABLE
))
{
// If the build failed, don't complain that there was no matching artifact.
// The build probably didn't even get to the point where it produces artifacts.
...
...
core/src/main/java/hudson/util/XStream2.java
浏览文件 @
71d7562d
...
...
@@ -306,15 +306,22 @@ public class XStream2 extends XStream {
this
.
xstream
=
xstream
;
}
private
Converter
findConverter
(
Class
<?>
t
)
{
@CheckForNull
private
Converter
findConverter
(
@CheckForNull
Class
<?>
t
)
{
if
(
t
==
null
)
{
return
null
;
}
Converter
result
=
cache
.
get
(
t
);
if
(
result
!=
null
)
// ConcurrentHashMap does not allow null, so use this object to represent null
return
result
==
this
?
null
:
result
;
try
{
if
(
t
==
null
||
t
.
getClassLoader
()==
null
)
final
ClassLoader
classLoader
=
t
.
getClassLoader
();
if
(
classLoader
==
null
)
{
return
null
;
Class
<?>
cl
=
t
.
getClassLoader
().
loadClass
(
t
.
getName
()
+
"$ConverterImpl"
);
}
Class
<?>
cl
=
classLoader
.
loadClass
(
t
.
getName
()
+
"$ConverterImpl"
);
Constructor
<?>
c
=
cl
.
getConstructors
()[
0
];
Class
<?>[]
p
=
c
.
getParameterTypes
();
...
...
core/src/main/java/hudson/util/jna/Advapi32.java
浏览文件 @
71d7562d
...
...
@@ -22,6 +22,7 @@ import com.sun.jna.Pointer;
import
com.sun.jna.win32.StdCallLibrary
;
import
com.sun.jna.ptr.PointerByReference
;
import
com.sun.jna.ptr.IntByReference
;
import
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
@@ -318,6 +319,7 @@ typedef struct _SERVICE_STATUS {
DWORD dwWaitHint;
} SERVICE_STATUS,
*LPSERVICE_STATUS;*/
@SuppressFBWarnings
(
value
=
"UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"
,
justification
=
"JNA Data Structure"
)
class
SERVICE_STATUS
extends
Structure
{
public
int
dwServiceType
;
public
int
dwCurrentState
;
...
...
@@ -342,6 +344,7 @@ typedef struct _SERVICE_TABLE_ENTRY {
LPSERVICE_MAIN_FUNCTION lpServiceProc;
} SERVICE_TABLE_ENTRY,
*LPSERVICE_TABLE_ENTRY;*/
@SuppressFBWarnings
(
value
=
"UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"
,
justification
=
"JNA Data Structure"
)
class
SERVICE_TABLE_ENTRY
extends
Structure
{
public
String
lpServiceName
;
public
SERVICE_MAIN_FUNCTION
lpServiceProc
;
...
...
@@ -365,6 +368,7 @@ typedef struct _SERVICE_TABLE_ENTRY {
LPTSTR lpDescription;
} SERVICE_DESCRIPTION,
*LPSERVICE_DESCRIPTION;*/
@SuppressFBWarnings
(
value
=
"UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"
,
justification
=
"JNA Data Structure"
)
class
SERVICE_DESCRIPTION
extends
ChangeServiceConfig2Info
{
public
String
lpDescription
;
}
...
...
core/src/main/java/hudson/util/jna/SHELLEXECUTEINFO.java
浏览文件 @
71d7562d
...
...
@@ -26,6 +26,7 @@ package hudson.util.jna;
import
com.sun.jna.Pointer
;
import
com.sun.jna.Structure
;
import
com.sun.jna.Union
;
import
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
@@ -56,6 +57,7 @@ typedef struct _SHELLEXECUTEINFO {
* @author Kohsuke Kawaguchi
* @see <a href="http://msdn.microsoft.com/en-us/library/bb759784(v=VS.85).aspx">MSDN: SHELLEXECUTEINFO</a>
*/
@SuppressFBWarnings
(
value
=
"UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"
,
justification
=
"JNA Data Structure"
)
public
class
SHELLEXECUTEINFO
extends
Structure
{
public
int
cbSize
=
size
();
public
int
fMask
;
...
...
@@ -85,6 +87,7 @@ public class SHELLEXECUTEINFO extends Structure {
"hProcess"
);
}
@SuppressFBWarnings
(
value
=
"UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"
,
justification
=
"JNA Data Structure"
)
public
static
class
DUMMYUNIONNAME_union
extends
Union
{
public
Pointer
hIcon
;
public
Pointer
hMonitor
;
...
...
core/src/main/java/hudson/util/jna/WINBASE.java
浏览文件 @
71d7562d
...
...
@@ -17,6 +17,7 @@ package hudson.util.jna;
import
com.sun.jna.Structure
;
import
com.sun.jna.Pointer
;
import
edu.umd.cs.findbugs.annotations.SuppressFBWarnings
;
import
java.util.Arrays
;
import
java.util.List
;
...
...
@@ -33,6 +34,7 @@ typedef struct _SECURITY_ATTRIBUTES {
} SECURITY_ATTRIBUTES,
*PSECURITY_ATTRIBUTES,
*LPSECURITY_ATTRIBUTES;*/
@SuppressFBWarnings
(
value
=
"UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"
,
justification
=
"JNA Data Structure"
)
class
SECURITY_ATTRIBUTES
extends
Structure
{
public
int
nLength
;
public
Pointer
lpSecurityDescriptor
;
...
...
@@ -50,6 +52,7 @@ typedef struct _FILETIME {
DWORD dwLowDateTime;
DWORD dwHighDateTime;
} FILETIME, *PFILETIME, *LPFILETIME;*/
@SuppressFBWarnings
(
value
=
"UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"
,
justification
=
"JNA Data Structure"
)
class
FILETIME
extends
Structure
{
public
int
dwLowDateTime
;
public
int
dwHighDateTime
;
...
...
core/src/main/resources/hudson/util/HudsonIsRestarting/index_es.properties
浏览文件 @
71d7562d
...
...
@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Please\
wait\
while\
Jenkins\
is\
restarting
=
Por favor espera hasta que
j
enkins acabe de reiniciarse.
Please\
wait\
while\
Jenkins\
is\
restarting
=
Por favor espera hasta que
J
enkins acabe de reiniciarse.
Your\
browser\
will\
reload\
automatically\
when\
Jenkins\
is\
ready.
=
Su navegador recargará esta página cuando Jenkins esté listo.
core/src/main/resources/lib/form/serverTcpPort_es.properties
浏览文件 @
71d7562d
...
...
@@ -20,6 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Fixed
=
Arreglad
o
Random
=
Aleatori
a
Fixed
=
Fij
o
Random
=
Aleatori
o
Disable
=
Desactivar
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录