Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
f5742df1
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,发现更多精彩内容 >>
提交
f5742df1
编写于
8月 27, 2013
作者:
E
evernat
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Optimize and close Zip resources in ClassicPluginStrategy and FilePath
上级
3835b3fc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
25 deletion
+35
-25
core/src/main/java/hudson/ClassicPluginStrategy.java
core/src/main/java/hudson/ClassicPluginStrategy.java
+29
-24
core/src/main/java/hudson/FilePath.java
core/src/main/java/hudson/FilePath.java
+6
-1
未找到文件。
core/src/main/java/hudson/ClassicPluginStrategy.java
浏览文件 @
f5742df1
...
...
@@ -440,7 +440,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
* Repackage classes directory into a jar file to make it remoting friendly.
* The remoting layer can cache jar files but not class files.
*/
private
static
void
createClassJarFromWebInfClasses
(
File
archive
,
File
destDir
,
Project
prj
)
{
private
static
void
createClassJarFromWebInfClasses
(
File
archive
,
File
destDir
,
Project
prj
)
throws
IOException
{
File
classesJar
=
new
File
(
destDir
,
"WEB-INF/lib/classes.jar"
);
ZipFileSet
zfs
=
new
ZipFileSet
();
...
...
@@ -457,31 +457,36 @@ public class ClassicPluginStrategy implements PluginStrategy {
mapper
.
add
(
gm
);
final
long
dirTime
=
archive
.
lastModified
();
Zip
z
=
new
Zip
()
{
/**
* Forces the fixed timestamp for directories to make sure
* classes.jar always get a consistent checksum.
*/
protected
void
zipDir
(
Resource
dir
,
ZipOutputStream
zOut
,
String
vPath
,
int
mode
,
ZipExtraField
[]
extra
)
throws
IOException
{
ZipOutputStream
wrapped
=
new
ZipOutputStream
(
new
NullOutputStream
())
{
@Override
public
void
putNextEntry
(
ZipEntry
ze
)
throws
IOException
{
ze
.
setTime
(
dirTime
+
1999
);
// roundup
super
.
putNextEntry
(
ze
);
}
};
super
.
zipDir
(
dir
,
wrapped
,
vPath
,
mode
,
extra
);
// this ZipOutputStream is reused and not created for each directory
final
ZipOutputStream
wrappedZOut
=
new
ZipOutputStream
(
new
NullOutputStream
())
{
@Override
public
void
putNextEntry
(
ZipEntry
ze
)
throws
IOException
{
ze
.
setTime
(
dirTime
+
1999
);
// roundup
super
.
putNextEntry
(
ze
);
}
};
z
.
setProject
(
prj
);
z
.
setTaskType
(
"zip"
);
classesJar
.
getParentFile
().
mkdirs
();
z
.
setDestFile
(
classesJar
);
z
.
add
(
mapper
);
z
.
execute
();
try
{
Zip
z
=
new
Zip
()
{
/**
* Forces the fixed timestamp for directories to make sure
* classes.jar always get a consistent checksum.
*/
protected
void
zipDir
(
Resource
dir
,
ZipOutputStream
zOut
,
String
vPath
,
int
mode
,
ZipExtraField
[]
extra
)
throws
IOException
{
// use wrappedZOut instead of zOut
super
.
zipDir
(
dir
,
wrappedZOut
,
vPath
,
mode
,
extra
);
}
};
z
.
setProject
(
prj
);
z
.
setTaskType
(
"zip"
);
classesJar
.
getParentFile
().
mkdirs
();
z
.
setDestFile
(
classesJar
);
z
.
add
(
mapper
);
z
.
execute
();
}
finally
{
wrappedZOut
.
close
();
}
}
private
static
void
unzipExceptClasses
(
File
archive
,
File
destDir
,
Project
prj
)
{
...
...
core/src/main/java/hudson/FilePath.java
浏览文件 @
f5742df1
...
...
@@ -527,7 +527,12 @@ public final class FilePath implements Serializable {
if
(
p
!=
null
)
{
p
.
mkdirs
();
}
IOUtils
.
copy
(
zip
.
getInputStream
(
e
),
f
);
InputStream
input
=
zip
.
getInputStream
(
e
);
try
{
IOUtils
.
copy
(
input
,
f
);
}
finally
{
input
.
close
();
}
try
{
FilePath
target
=
new
FilePath
(
f
);
int
mode
=
e
.
getUnixMode
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录