Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
389c810e
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看板
提交
389c810e
编写于
2月 21, 2015
作者:
R
redestad
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8068790: ZipEntry/JarEntry.setCreation/LastAccessTime(null) don't throw NPE as specified
Reviewed-by: coffeys, sherman
上级
2b07bf20
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
7 deletion
+28
-7
src/share/classes/java/util/zip/ZipEntry.java
src/share/classes/java/util/zip/ZipEntry.java
+3
-6
test/java/util/zip/TestExtraTime.java
test/java/util/zip/TestExtraTime.java
+25
-1
未找到文件。
src/share/classes/java/util/zip/ZipEntry.java
浏览文件 @
389c810e
...
@@ -180,8 +180,7 @@ class ZipEntry implements ZipConstants, Cloneable {
...
@@ -180,8 +180,7 @@ class ZipEntry implements ZipConstants, Cloneable {
* @since 1.8
* @since 1.8
*/
*/
public
ZipEntry
setLastModifiedTime
(
FileTime
time
)
{
public
ZipEntry
setLastModifiedTime
(
FileTime
time
)
{
Objects
.
requireNonNull
(
name
,
"time"
);
this
.
mtime
=
Objects
.
requireNonNull
(
time
,
"lastModifiedTime"
);
this
.
mtime
=
time
;
this
.
time
=
time
.
to
(
TimeUnit
.
MILLISECONDS
);
this
.
time
=
time
.
to
(
TimeUnit
.
MILLISECONDS
);
return
this
;
return
this
;
}
}
...
@@ -227,8 +226,7 @@ class ZipEntry implements ZipConstants, Cloneable {
...
@@ -227,8 +226,7 @@ class ZipEntry implements ZipConstants, Cloneable {
* @since 1.8
* @since 1.8
*/
*/
public
ZipEntry
setLastAccessTime
(
FileTime
time
)
{
public
ZipEntry
setLastAccessTime
(
FileTime
time
)
{
Objects
.
requireNonNull
(
name
,
"time"
);
this
.
atime
=
Objects
.
requireNonNull
(
time
,
"lastAccessTime"
);
this
.
atime
=
time
;
return
this
;
return
this
;
}
}
...
@@ -265,8 +263,7 @@ class ZipEntry implements ZipConstants, Cloneable {
...
@@ -265,8 +263,7 @@ class ZipEntry implements ZipConstants, Cloneable {
* @since 1.8
* @since 1.8
*/
*/
public
ZipEntry
setCreationTime
(
FileTime
time
)
{
public
ZipEntry
setCreationTime
(
FileTime
time
)
{
Objects
.
requireNonNull
(
name
,
"time"
);
this
.
ctime
=
Objects
.
requireNonNull
(
time
,
"creationTime"
);
this
.
ctime
=
time
;
return
this
;
return
this
;
}
}
...
...
test/java/util/zip/TestExtraTime.java
浏览文件 @
389c810e
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
/**
/**
* @test
* @test
* @bug 4759491 6303183 7012868 8015666 8023713
* @bug 4759491 6303183 7012868 8015666 8023713
8068790
* @summary Test ZOS and ZIS timestamp in extra field correctly
* @summary Test ZOS and ZIS timestamp in extra field correctly
*/
*/
...
@@ -69,6 +69,8 @@ public class TestExtraTime {
...
@@ -69,6 +69,8 @@ public class TestExtraTime {
test
(
mtime
,
atime
,
ctime
,
tz
,
extra
);
test
(
mtime
,
atime
,
ctime
,
tz
,
extra
);
}
}
}
}
testNullHandling
();
}
}
static
void
test
(
FileTime
mtime
,
FileTime
atime
,
FileTime
ctime
,
static
void
test
(
FileTime
mtime
,
FileTime
atime
,
FileTime
ctime
,
...
@@ -154,4 +156,26 @@ public class TestExtraTime {
...
@@ -154,4 +156,26 @@ public class TestExtraTime {
}
}
}
}
}
}
static
void
testNullHandling
()
{
ZipEntry
ze
=
new
ZipEntry
(
"TestExtraTime.java"
);
try
{
ze
.
setLastAccessTime
(
null
);
throw
new
RuntimeException
(
"setLastAccessTime(null) should throw NPE"
);
}
catch
(
NullPointerException
ignored
)
{
// pass
}
try
{
ze
.
setCreationTime
(
null
);
throw
new
RuntimeException
(
"setCreationTime(null) should throw NPE"
);
}
catch
(
NullPointerException
ignored
)
{
// pass
}
try
{
ze
.
setLastModifiedTime
(
null
);
throw
new
RuntimeException
(
"setLastModifiedTime(null) should throw NPE"
);
}
catch
(
NullPointerException
ignored
)
{
// pass
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录