Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
c0cb2337
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,发现更多精彩内容 >>
提交
c0cb2337
编写于
12月 20, 2012
作者:
A
alanb
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8005281: (props) loadFromXML/storeToXML with small parser is not thread safe
Reviewed-by: mchung
上级
d09fa405
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
117 addition
and
2 deletion
+117
-2
src/share/classes/jdk/internal/util/xml/BasicXmlPropertiesProvider.java
...ses/jdk/internal/util/xml/BasicXmlPropertiesProvider.java
+2
-2
test/java/util/Properties/ConcurrentLoadAndStoreXML.java
test/java/util/Properties/ConcurrentLoadAndStoreXML.java
+115
-0
未找到文件。
src/share/classes/jdk/internal/util/xml/BasicXmlPropertiesProvider.java
浏览文件 @
c0cb2337
...
...
@@ -38,14 +38,13 @@ import sun.util.spi.XmlPropertiesProvider;
public
class
BasicXmlPropertiesProvider
extends
XmlPropertiesProvider
{
private
final
PropertiesDefaultHandler
handler
=
new
PropertiesDefaultHandler
();
public
BasicXmlPropertiesProvider
()
{
}
@Override
public
void
load
(
Properties
props
,
InputStream
in
)
throws
IOException
,
InvalidPropertiesFormatException
{
PropertiesDefaultHandler
handler
=
new
PropertiesDefaultHandler
();
handler
.
load
(
props
,
in
);
}
...
...
@@ -54,6 +53,7 @@ public class BasicXmlPropertiesProvider extends XmlPropertiesProvider {
String
encoding
)
throws
IOException
{
PropertiesDefaultHandler
handler
=
new
PropertiesDefaultHandler
();
handler
.
store
(
props
,
os
,
comment
,
encoding
);
}
}
test/java/util/Properties/ConcurrentLoadAndStoreXML.java
0 → 100644
浏览文件 @
c0cb2337
/*
* 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 8005281
* @summary Test that the Properties storeToXML and loadFromXML methods are
* thread safe
* @run main ConcurrentLoadAndStoreXML
* @run main/othervm -Dsun.util.spi.XmlPropertiesProvider=jdk.internal.util.xml.BasicXmlPropertiesProvider ConcurrentLoadAndStoreXML
*/
import
java.io.*
;
import
java.util.Properties
;
import
java.util.Random
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Future
;
public
class
ConcurrentLoadAndStoreXML
{
static
final
Random
RAND
=
new
Random
();
static
volatile
boolean
done
;
/**
* Simple task that bashes on storeToXML and loadFromXML until the "done"
* flag is set.
*/
static
class
Basher
implements
Callable
<
Void
>
{
final
Properties
props
;
Basher
(
Properties
props
)
{
this
.
props
=
props
;
}
public
Void
call
()
throws
IOException
{
while
(!
done
)
{
// store as XML format
ByteArrayOutputStream
out
=
new
ByteArrayOutputStream
();
props
.
storeToXML
(
out
,
null
,
"UTF-8"
);
// load from XML format
Properties
p
=
new
Properties
();
ByteArrayInputStream
in
=
new
ByteArrayInputStream
(
out
.
toByteArray
());
p
.
loadFromXML
(
in
);
// check that the properties are as expected
if
(!
p
.
equals
(
props
))
throw
new
RuntimeException
(
"Properties not equal"
);
}
return
null
;
}
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
final
int
NTASKS
=
4
+
RAND
.
nextInt
(
4
);
// create Bashers with Properties of random keys and values
Basher
[]
basher
=
new
Basher
[
NTASKS
];
for
(
int
i
=
0
;
i
<
NTASKS
;
i
++)
{
Properties
props
=
new
Properties
();
for
(
int
j
=
0
;
j
<
RAND
.
nextInt
(
100
);
j
++)
{
String
key
=
"k"
+
RAND
.
nextInt
(
1000
);
String
value
=
"v"
+
RAND
.
nextInt
(
1000
);
props
.
put
(
key
,
value
);
}
basher
[
i
]
=
new
Basher
(
props
);
}
ExecutorService
pool
=
Executors
.
newFixedThreadPool
(
NTASKS
);
try
{
// kick off the bashers
Future
<
Void
>[]
task
=
new
Future
[
NTASKS
];
for
(
int
i
=
0
;
i
<
NTASKS
;
i
++)
{
task
[
i
]
=
pool
.
submit
(
basher
[
i
]);
}
// give them time to interfere with each each
Thread
.
sleep
(
2000
);
done
=
true
;
// check the result
for
(
int
i
=
0
;
i
<
NTASKS
;
i
++)
{
task
[
i
].
get
();
}
}
finally
{
done
=
true
;
pool
.
shutdown
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录