Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
128ba434
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,发现更多精彩内容 >>
提交
128ba434
编写于
8月 09, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixing a few warnings.
上级
92b14119
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
7 deletion
+17
-7
cli/src/main/java/hudson/cli/CLI.java
cli/src/main/java/hudson/cli/CLI.java
+17
-7
未找到文件。
cli/src/main/java/hudson/cli/CLI.java
浏览文件 @
128ba434
...
...
@@ -157,7 +157,7 @@ public class CLI {
}
private
Channel
connectViaHttp
(
String
url
)
throws
IOException
{
LOGGER
.
fine
(
"Trying to connect to "
+
url
+
" via HTTP"
);
LOGGER
.
log
(
FINE
,
"Trying to connect to {0} via HTTP"
,
url
);
url
+=
"cli"
;
URL
jenkins
=
new
URL
(
url
);
...
...
@@ -176,7 +176,7 @@ public class CLI {
}
private
Channel
connectViaCliPort
(
URL
jenkins
,
CliPort
clip
)
throws
IOException
{
LOGGER
.
fine
(
"Trying to connect directly via TCP/IP to "
+
clip
.
endpoint
);
LOGGER
.
log
(
FINE
,
"Trying to connect directly via TCP/IP to {0}"
,
clip
.
endpoint
);
final
Socket
s
;
OutputStream
out
;
...
...
@@ -188,12 +188,12 @@ public class CLI {
// read the response from the proxy
ByteArrayOutputStream
rsp
=
new
ByteArrayOutputStream
();
while
(!
rsp
.
toString
().
endsWith
(
"\r\n\r\n"
))
{
while
(!
rsp
.
toString
(
"ISO-8859-1"
).
endsWith
(
"\r\n\r\n"
))
{
int
ch
=
s
.
getInputStream
().
read
();
if
(
ch
<
0
)
throw
new
IOException
(
"Failed to read the HTTP proxy response: "
+
rsp
);
rsp
.
write
(
ch
);
}
String
head
=
new
BufferedReader
(
new
StringReader
(
rsp
.
toString
())).
readLine
();
String
head
=
new
BufferedReader
(
new
StringReader
(
rsp
.
toString
(
"ISO-8859-1"
))).
readLine
();
if
(!
head
.
startsWith
(
"HTTP/1.0 200 "
))
throw
new
IOException
(
"Failed to establish a connection through HTTP proxy: "
+
rsp
);
...
...
@@ -506,8 +506,13 @@ public class CLI {
Properties
props
=
new
Properties
();
try
{
InputStream
is
=
CLI
.
class
.
getResourceAsStream
(
"/jenkins/cli/jenkins-cli-version.properties"
);
if
(
is
!=
null
)
props
.
load
(
is
);
if
(
is
!=
null
)
{
try
{
props
.
load
(
is
);
}
finally
{
is
.
close
();
}
}
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
// if the version properties is missing, that's OK.
}
...
...
@@ -526,11 +531,16 @@ public class CLI {
}
private
static
String
readPemFile
(
File
f
)
throws
IOException
{
DataInputStream
dis
=
new
DataInputStream
(
new
FileInputStream
(
f
));
FileInputStream
is
=
new
FileInputStream
(
f
);
try
{
DataInputStream
dis
=
new
DataInputStream
(
is
);
byte
[]
bytes
=
new
byte
[(
int
)
f
.
length
()];
dis
.
readFully
(
bytes
);
dis
.
close
();
return
new
String
(
bytes
);
}
finally
{
is
.
close
();
}
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录