Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
ebc7a297
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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看板
提交
ebc7a297
编写于
12月 08, 2010
作者:
O
okutsu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
4396385: [Fmt-Da] SimpleDateFormat too lenient when parsing 1-based hours
Reviewed-by: peytoia
上级
7a2b1d54
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
94 addition
and
2 deletion
+94
-2
src/share/classes/java/text/SimpleDateFormat.java
src/share/classes/java/text/SimpleDateFormat.java
+16
-2
test/java/text/Format/DateFormat/Bug4396385.java
test/java/text/Format/DateFormat/Bug4396385.java
+78
-0
未找到文件。
src/share/classes/java/text/SimpleDateFormat.java
浏览文件 @
ebc7a297
...
...
@@ -1839,8 +1839,15 @@ public class SimpleDateFormat extends DateFormat {
break
parsing
;
case
PATTERN_HOUR_OF_DAY1:
// 'k' 1-based. eg, 23:59 + 1 hour =>> 24:59
if
(!
isLenient
())
{
// Validate the hour value in non-lenient
if
(
value
<
1
||
value
>
24
)
{
break
parsing
;
}
}
// [We computed 'value' above.]
if
(
value
==
calendar
.
getMaximum
(
Calendar
.
HOUR_OF_DAY
)+
1
)
value
=
0
;
if
(
value
==
calendar
.
getMaximum
(
Calendar
.
HOUR_OF_DAY
)+
1
)
value
=
0
;
calb
.
set
(
Calendar
.
HOUR_OF_DAY
,
value
);
return
pos
.
index
;
...
...
@@ -1886,8 +1893,15 @@ public class SimpleDateFormat extends DateFormat {
break
parsing
;
case
PATTERN_HOUR1:
// 'h' 1-based. eg, 11PM + 1 hour =>> 12 AM
if
(!
isLenient
())
{
// Validate the hour value in non-lenient
if
(
value
<
1
||
value
>
12
)
{
break
parsing
;
}
}
// [We computed 'value' above.]
if
(
value
==
calendar
.
getLeastMaximum
(
Calendar
.
HOUR
)+
1
)
value
=
0
;
if
(
value
==
calendar
.
getLeastMaximum
(
Calendar
.
HOUR
)+
1
)
value
=
0
;
calb
.
set
(
Calendar
.
HOUR
,
value
);
return
pos
.
index
;
...
...
test/java/text/Format/DateFormat/Bug4396385.java
0 → 100644
浏览文件 @
ebc7a297
/*
* Copyright (c) 2010, 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 4396385
* @summary Make sure to detect invalid values for 1-based hour formats.
*/
import
java.text.*
;
import
java.util.*
;
public
class
Bug4396385
{
private
static
int
errorCount
=
0
;
private
static
String
[][]
data
=
{
{
"hh:mma"
,
"-1:30AM"
},
{
"hh:mma"
,
"00:30AM"
},
{
"hh:mma"
,
"13:30AM"
},
{
"kk:mm"
,
"-1:12"
},
{
"kk:mm"
,
"00:12"
},
{
"kk:mm"
,
"25:12"
},
};
public
static
void
main
(
String
[]
args
)
{
TimeZone
tz
=
TimeZone
.
getDefault
();
// Use "GMT" to avoid any surprises related to offset
// transitions.
TimeZone
.
setDefault
(
TimeZone
.
getTimeZone
(
"GMT"
));
try
{
for
(
String
[]
item
:
data
)
{
test
(
item
[
0
],
item
[
1
]);
}
}
finally
{
// Restore the default time zone
TimeZone
.
setDefault
(
tz
);
}
if
(
errorCount
>
0
)
{
throw
new
RuntimeException
(
"Failed with "
+
errorCount
+
" error(s)."
);
}
}
private
static
void
test
(
String
pattern
,
String
src
)
{
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
pattern
,
Locale
.
US
);
sdf
.
setLenient
(
false
);
ParsePosition
pos
=
new
ParsePosition
(
0
);
System
.
out
.
printf
(
"parse: \"%s\" with \"%s\""
,
src
,
pattern
);
Date
date
=
sdf
.
parse
(
src
,
pos
);
System
.
out
.
printf
(
": date = %s, errorIndex = %d"
,
date
,
pos
.
getErrorIndex
());
if
(
date
!=
null
||
pos
.
getErrorIndex
()
==
-
1
)
{
System
.
out
.
println
(
": failed"
);
errorCount
++;
}
else
{
System
.
out
.
println
(
": passed"
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录