Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
132f8b76
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
132f8b76
编写于
3月 09, 2012
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-12514]
Fixed the file overwrite problem on Windows.
上级
63529f0f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
6 deletion
+20
-6
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/PluginManager.java
core/src/main/java/hudson/PluginManager.java
+17
-6
未找到文件。
changelog.html
浏览文件 @
132f8b76
...
...
@@ -55,6 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
bug
>
Fixed a bug in the auto-overwrite of bundled plugins on Windows.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-12514"
>
issue 12514
</a>
)
<li
class=
bug
>
Fixed a temporary memory spike when dealing with rapidly growing large console output and interactive monitoring.
<li
class=
bug
>
...
...
core/src/main/java/hudson/PluginManager.java
浏览文件 @
132f8b76
...
...
@@ -414,12 +414,9 @@ public abstract class PluginManager extends AbstractModelObject {
File
file
=
new
File
(
rootDir
,
fileName
);
File
pinFile
=
new
File
(
rootDir
,
fileName
+
".pinned"
);
{
// normalization first
File
legacyFile
=
new
File
(
rootDir
,
legacyName
);
if
(
legacyFile
.
exists
())
legacyFile
.
renameTo
(
file
);
File
legacyPinFile
=
new
File
(
rootDir
,
legacyName
+
".pinned"
);
if
(
legacyPinFile
.
exists
())
legacyPinFile
.
renameTo
(
pinFile
);
}
// normalization first, if the old file exists.
rename
(
new
File
(
rootDir
,
legacyName
),
file
);
rename
(
new
File
(
rootDir
,
legacyName
+
".pinned"
),
pinFile
);
// update file if:
// - no file exists today
...
...
@@ -434,6 +431,20 @@ public abstract class PluginManager extends AbstractModelObject {
}
}
/**
* Rename a legacy file to a new name, with care to Windows where {@link File#renameTo(File)}
* doesn't work if the destination already exists.
*/
private
void
rename
(
File
legacyFile
,
File
newFile
)
throws
IOException
{
if
(!
legacyFile
.
exists
())
return
;
if
(
newFile
.
exists
())
{
Util
.
deleteFile
(
newFile
);
}
if
(!
legacyFile
.
renameTo
(
newFile
))
{
LOGGER
.
warning
(
"Failed to rename "
+
legacyFile
+
" to "
+
newFile
);
}
}
/**
* Creates a hudson.PluginStrategy, looking at the corresponding system property.
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录