Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
a9c2076c
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,发现更多精彩内容 >>
提交
a9c2076c
编写于
10月 17, 2012
作者:
N
ngmr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8000955: Hashtable.Entry.hashCode() does not conform to Map.Entry.hashCode() defined behaviour
Reviewed-by: mduigou, alanb
上级
b1e83e1a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
110 addition
and
1 deletion
+110
-1
src/share/classes/java/util/Hashtable.java
src/share/classes/java/util/Hashtable.java
+1
-1
test/java/util/Map/EntryHashCode.java
test/java/util/Map/EntryHashCode.java
+109
-0
未找到文件。
src/share/classes/java/util/Hashtable.java
浏览文件 @
a9c2076c
...
@@ -1059,7 +1059,7 @@ public class Hashtable<K,V>
...
@@ -1059,7 +1059,7 @@ public class Hashtable<K,V>
}
}
public
int
hashCode
()
{
public
int
hashCode
()
{
return
hash
^
(
value
==
null
?
0
:
value
.
hashCode
(
));
return
(
Objects
.
hashCode
(
key
)
^
Objects
.
hashCode
(
value
));
}
}
public
String
toString
()
{
public
String
toString
()
{
...
...
test/java/util/Map/EntryHashCode.java
0 → 100644
浏览文件 @
a9c2076c
/*
* 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.
*/
/*
* Portions Copyright (c) 2012 IBM Corporation
*/
/*
* @test
* @bug 8000955
* @summary Map.Entry implementations need to comply with Map.Entry.hashCode() defined behaviour.
* @author ngmr
*/
import
java.util.*
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ConcurrentSkipListMap
;
public
class
EntryHashCode
{
private
static
final
int
TEST_SIZE
=
100
;
static
final
Object
[][]
entryData
=
{
new
Object
[
TEST_SIZE
],
new
Object
[
TEST_SIZE
]
};
@SuppressWarnings
(
"unchecked"
)
static
final
Map
<
Object
,
Object
>[]
maps
=
(
Map
<
Object
,
Object
>[])
new
Map
[]
{
new
HashMap
<>(),
new
Hashtable
<>(),
new
IdentityHashMap
<>(),
new
LinkedHashMap
<>(),
new
TreeMap
<>(),
new
WeakHashMap
<>(),
new
ConcurrentHashMap
<>(),
new
ConcurrentSkipListMap
<>()
};
static
{
for
(
int
i
=
0
;
i
<
entryData
[
0
].
length
;
i
++)
{
// key objects need to be Comparable for use in TreeMap
entryData
[
0
][
i
]
=
new
Comparable
<
Object
>()
{
public
int
compareTo
(
Object
o
)
{
return
(
hashCode
()
-
o
.
hashCode
());
}
};
entryData
[
1
][
i
]
=
new
Object
();
}
}
private
static
void
addTestData
(
Map
<
Object
,
Object
>
map
)
{
for
(
int
i
=
0
;
i
<
entryData
[
0
].
length
;
i
++)
{
map
.
put
(
entryData
[
0
][
i
],
entryData
[
1
][
i
]);
}
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
Exception
failure
=
null
;
for
(
Map
<
Object
,
Object
>
map:
maps
)
{
addTestData
(
map
);
try
{
for
(
Map
.
Entry
<
Object
,
Object
>
e:
map
.
entrySet
())
{
Object
key
=
e
.
getKey
();
Object
value
=
e
.
getValue
();
int
expectedEntryHashCode
=
(
Objects
.
hashCode
(
key
)
^
Objects
.
hashCode
(
value
));
if
(
e
.
hashCode
()
!=
expectedEntryHashCode
)
{
throw
new
Exception
(
"FAILURE: "
+
e
.
getClass
().
getName
()
+
".hashCode() does not conform to defined"
+
" behaviour of java.util.Map.Entry.hashCode()"
);
}
}
}
catch
(
Exception
e
)
{
if
(
failure
==
null
)
{
failure
=
e
;
}
else
{
failure
.
addSuppressed
(
e
);
}
}
finally
{
map
.
clear
();
}
}
if
(
failure
!=
null
)
{
throw
failure
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录