Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
c008f652
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c008f652
编写于
7月 09, 2008
作者:
M
malenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
4994637: LTP: java.beans.java_util_Map_PersistenceDelegate: ConcurrentModificationException
Reviewed-by: peterz, loneid
上级
de015226
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
79 addition
and
5 deletion
+79
-5
jdk/src/share/classes/java/beans/MetaData.java
jdk/src/share/classes/java/beans/MetaData.java
+1
-1
jdk/test/java/beans/XMLEncoder/Test4994637.java
jdk/test/java/beans/XMLEncoder/Test4994637.java
+58
-0
jdk/test/java/beans/XMLEncoder/java_util_HashMap.java
jdk/test/java/beans/XMLEncoder/java_util_HashMap.java
+20
-4
未找到文件。
jdk/src/share/classes/java/beans/MetaData.java
浏览文件 @
c008f652
...
...
@@ -650,7 +650,7 @@ class java_util_Map_PersistenceDelegate extends DefaultPersistenceDelegate {
// Remove the new elements.
// Do this first otherwise we undo the adding work.
if
(
newMap
!=
null
)
{
for
(
Object
newKey
:
newMap
.
keySet
()
)
{
for
(
Object
newKey
:
newMap
.
keySet
().
toArray
()
)
{
// PENDING: This "key" is not in the right environment.
if
(!
oldMap
.
containsKey
(
newKey
))
{
invokeStatement
(
oldInstance
,
"remove"
,
new
Object
[]{
newKey
},
out
);
...
...
jdk/test/java/beans/XMLEncoder/Test4994637.java
0 → 100644
浏览文件 @
c008f652
/*
* Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 4994637
* @summary Tests custom map encoding
* @author Sergey Malenkov
*/
import
java.util.HashMap
;
public
final
class
Test4994637
extends
AbstractTest
<
HashMap
>
{
public
static
void
main
(
String
[]
args
)
{
new
Test4994637
().
test
(
true
);
}
@Override
protected
CustomMap
getObject
()
{
return
new
CustomMap
();
}
@Override
protected
CustomMap
getAnotherObject
()
{
CustomMap
map
=
new
CustomMap
();
map
.
clear
();
map
.
put
(
null
,
"zero"
);
return
map
;
}
public
static
final
class
CustomMap
extends
HashMap
<
String
,
String
>
{
public
CustomMap
()
{
put
(
"1"
,
"one"
);
put
(
"2"
,
"two"
);
put
(
"3"
,
"three"
);
}
}
}
jdk/test/java/beans/XMLEncoder/java_util_HashMap.java
浏览文件 @
c008f652
/*
* Copyright 2006-200
7
Sun Microsystems, Inc. All Rights Reserved.
* Copyright 2006-200
8
Sun Microsystems, Inc. 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
...
...
@@ -23,7 +23,7 @@
/*
* @test
* @bug 4631471 4921212
* @bug 4631471 4921212
4994637
* @summary Tests HashMap encoding
* @author Sergey Malenkov
*/
...
...
@@ -36,10 +36,17 @@ public final class java_util_HashMap extends AbstractTest<Map<String, String>> {
new
java_util_HashMap
().
test
(
true
);
}
@Override
protected
Map
<
String
,
String
>
getObject
()
{
return
new
HashMap
<
String
,
String
>();
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
map
.
put
(
null
,
null
);
map
.
put
(
"key"
,
"value"
);
map
.
put
(
"key-null"
,
"null-value"
);
map
.
put
(
"way"
,
"remove"
);
return
map
;
}
@Override
protected
Map
<
String
,
String
>
getAnotherObject
()
{
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
map
.
put
(
null
,
"null-value"
);
...
...
@@ -48,6 +55,7 @@ public final class java_util_HashMap extends AbstractTest<Map<String, String>> {
return
map
;
}
@Override
protected
void
validate
(
Map
<
String
,
String
>
before
,
Map
<
String
,
String
>
after
)
{
super
.
validate
(
before
,
after
);
validate
(
before
);
...
...
@@ -55,10 +63,18 @@ public final class java_util_HashMap extends AbstractTest<Map<String, String>> {
}
private
static
void
validate
(
Map
<
String
,
String
>
map
)
{
if
(!
map
.
isEmpty
())
{
switch
(
map
.
size
())
{
case
3
:
validate
(
map
,
null
,
"null-value"
);
validate
(
map
,
"key"
,
"value"
);
validate
(
map
,
"key-null"
,
null
);
break
;
case
4
:
validate
(
map
,
null
,
null
);
validate
(
map
,
"key"
,
"value"
);
validate
(
map
,
"key-null"
,
"null-value"
);
validate
(
map
,
"way"
,
"remove"
);
break
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录