Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
ee672d96
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ee672d96
编写于
1月 27, 2012
作者:
O
okutsu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7130335: Problem with timezone in a SimpleDateFormat
Reviewed-by: peytoia
上级
82795500
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
68 addition
and
3 deletion
+68
-3
src/share/classes/java/text/SimpleDateFormat.java
src/share/classes/java/text/SimpleDateFormat.java
+2
-3
test/java/text/Format/DateFormat/Bug7130335.java
test/java/text/Format/DateFormat/Bug7130335.java
+66
-0
未找到文件。
src/share/classes/java/text/SimpleDateFormat.java
浏览文件 @
ee672d96
/*
* Copyright (c) 1996, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 201
2
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -1646,8 +1646,7 @@ public class SimpleDateFormat extends DateFormat {
// determine the local time. (6645292)
int
dstAmount
=
(
nameIndex
>=
3
)
?
tz
.
getDSTSavings
()
:
0
;
if
(!(
useSameName
||
(
nameIndex
>=
3
&&
dstAmount
==
0
)))
{
calb
.
set
(
Calendar
.
ZONE_OFFSET
,
tz
.
getRawOffset
())
.
set
(
Calendar
.
DST_OFFSET
,
dstAmount
);
calb
.
set
(
Calendar
.
DST_OFFSET
,
dstAmount
);
}
return
(
start
+
zoneNames
[
nameIndex
].
length
());
}
...
...
test/java/text/Format/DateFormat/Bug7130335.java
0 → 100644
浏览文件 @
ee672d96
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 7130335
* @summary Make sure that round-trip conversion (format/parse) works
* with old timestamps in Europe/Moscow.
*/
import
java.text.*
;
import
java.util.*
;
public
class
Bug7130335
{
private
static
final
TimeZone
MOSCOW
=
TimeZone
.
getTimeZone
(
"Europe/Moscow"
);
public
static
void
main
(
String
[]
args
)
throws
Exception
{
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss.SSS z"
,
Locale
.
US
);
sdf
.
setTimeZone
(
MOSCOW
);
Calendar
cal
=
new
GregorianCalendar
(
MOSCOW
);
cal
.
clear
();
// Try both +03:00 and +02:00
cal
.
set
(
1922
,
Calendar
.
SEPTEMBER
,
30
);
test
(
sdf
,
cal
);
cal
.
add
(
Calendar
.
DAY_OF_YEAR
,
1
);
test
(
sdf
,
cal
);
cal
.
set
(
1991
,
Calendar
.
MARCH
,
31
);
// in daylight saving time
test
(
sdf
,
cal
);
cal
.
add
(
Calendar
.
DAY_OF_YEAR
,
1
);
test
(
sdf
,
cal
);
// Try the current timestamp
cal
.
setTimeInMillis
(
System
.
currentTimeMillis
());
test
(
sdf
,
cal
);
}
private
static
void
test
(
SimpleDateFormat
sdf
,
Calendar
cal
)
throws
Exception
{
Date
d
=
cal
.
getTime
();
String
f
=
sdf
.
format
(
d
);
System
.
out
.
println
(
f
);
Date
pd
=
sdf
.
parse
(
f
);
String
p
=
sdf
.
format
(
pd
);
if
(!
d
.
equals
(
pd
)
||
!
f
.
equals
(
p
))
{
throw
new
RuntimeException
(
"format: "
+
f
+
", parse: "
+
p
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录