Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CSDN专家-深度学习进阶
jenkins
提交
d84eca45
J
jenkins
项目概览
CSDN专家-深度学习进阶
/
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,发现更多精彩内容 >>
提交
d84eca45
编写于
11月 13, 2012
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-15816] Run.ID_FORMATTER caches stale timezone values.
上级
d4b41700
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
92 addition
and
2 deletion
+92
-2
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/model/Run.java
+4
-2
core/src/test/java/hudson/model/RunTest.java
core/src/test/java/hudson/model/RunTest.java
+80
-0
core/src/test/java/hudson/model/StubJob.java
core/src/test/java/hudson/model/StubJob.java
+5
-0
未找到文件。
changelog.html
浏览文件 @
d84eca45
...
...
@@ -68,6 +68,9 @@ Upcoming changes</a>
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15733"
>
issue 15733
</a>
)
<li
class=
rfe
>
Support failsafe the same way as surefire in maven2 jobs
<li
class=
bug
>
Build records were broken if timezone was changed while running.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15816"
>
issue 15816
</a>
)
</ul>
</div>
<!--=END=-->
<h3><a
name=
v1.490
>
What's new in 1.490
</a>
(2012/11/12)
</h3>
...
...
core/src/main/java/hudson/model/Run.java
浏览文件 @
d84eca45
...
...
@@ -96,7 +96,6 @@ import javax.servlet.ServletException;
import
javax.servlet.http.HttpServletResponse
;
import
jenkins.model.Jenkins
;
import
jenkins.model.lazy.BuildReference
;
import
jenkins.util.io.OnMaster
;
import
net.sf.json.JSONObject
;
import
org.apache.commons.io.input.NullInputStream
;
...
...
@@ -240,11 +239,14 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
*/
private
volatile
transient
RunExecution
runner
;
private
static
final
SimpleDateFormat
CANONICAL_ID_FORMATTER
=
new
SimpleDateFormat
(
"yyyy-MM-dd_HH-mm-ss"
);
protected
static
final
ThreadLocal
<
SimpleDateFormat
>
ID_FORMATTER
=
new
ThreadLocal
<
SimpleDateFormat
>()
{
@Override
protected
SimpleDateFormat
initialValue
()
{
return
new
SimpleDateFormat
(
"yyyy-MM-dd_HH-mm-ss"
);
synchronized
(
CANONICAL_ID_FORMATTER
)
{
return
(
SimpleDateFormat
)
CANONICAL_ID_FORMATTER
.
clone
();
}
}
};
...
...
core/src/test/java/hudson/model/RunTest.java
0 → 100644
浏览文件 @
d84eca45
/*
* The MIT License
*
* Copyright 2012 Jesse Glick.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
hudson.model
;
import
java.util.TimeZone
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Test
;
import
org.jvnet.hudson.test.Bug
;
public
class
RunTest
{
@Bug
(
15816
)
@SuppressWarnings
({
"unchecked"
,
"rawtypes"
})
@Test
public
void
timezoneOfID
()
throws
Exception
{
TimeZone
origTZ
=
TimeZone
.
getDefault
();
try
{
final
Run
r
;
String
id
;
TimeZone
.
setDefault
(
TimeZone
.
getTimeZone
(
"America/Chicago"
));
ExecutorService
svc
=
Executors
.
newSingleThreadExecutor
();
try
{
r
=
svc
.
submit
(
new
Callable
<
Run
>()
{
@Override
public
Run
call
()
throws
Exception
{
return
new
Run
(
new
StubJob
(),
1234567890
)
{};
}
}).
get
();
TimeZone
.
setDefault
(
TimeZone
.
getTimeZone
(
"America/Los_Angeles"
));
id
=
r
.
getId
();
assertEquals
(
id
,
svc
.
submit
(
new
Callable
<
String
>()
{
@Override
public
String
call
()
throws
Exception
{
return
r
.
getId
();
}
}).
get
());
}
finally
{
svc
.
shutdown
();
}
TimeZone
.
setDefault
(
TimeZone
.
getTimeZone
(
"America/New_York"
));
svc
=
Executors
.
newSingleThreadExecutor
();
try
{
assertEquals
(
id
,
r
.
getId
());
assertEquals
(
id
,
svc
.
submit
(
new
Callable
<
String
>()
{
@Override
public
String
call
()
throws
Exception
{
return
r
.
getId
();
}
}).
get
());
}
finally
{
svc
.
shutdown
();
}
}
finally
{
TimeZone
.
setDefault
(
origTZ
);
}
}
}
core/src/test/java/hudson/model/StubJob.java
浏览文件 @
d84eca45
...
...
@@ -23,6 +23,7 @@
*/
package
hudson.model
;
import
java.io.File
;
import
java.util.SortedMap
;
/**
...
...
@@ -55,6 +56,10 @@ class StubJob extends Job {
// TODO Auto-generated method stub
}
@Override
protected
File
getBuildDir
()
{
return
new
File
(
System
.
getProperty
(
"java.io.tmpdir"
));
}
/**
* Override save so that nothig happens when setDisplayName() is called
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录