Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
3f287fe2
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,发现更多精彩内容 >>
提交
3f287fe2
编写于
3月 04, 2013
作者:
N
naoto
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8004240: Return value from getAdapterPrefence() can be modified
Reviewed-by: okutsu
上级
e1d1b08e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
67 addition
and
15 deletion
+67
-15
src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
...asses/sun/util/locale/provider/LocaleProviderAdapter.java
+18
-15
test/java/util/Locale/Bug8004240.java
test/java/util/Locale/Bug8004240.java
+49
-0
未找到文件。
src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
浏览文件 @
3f287fe2
...
...
@@ -33,6 +33,7 @@ import java.text.spi.DateFormatSymbolsProvider;
import
java.text.spi.DecimalFormatSymbolsProvider
;
import
java.text.spi.NumberFormatProvider
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.ResourceBundle
;
...
...
@@ -89,10 +90,7 @@ public abstract class LocaleProviderAdapter {
* LocaleProviderAdapter preference list. The default list is intended
* to behave the same manner in JDK7.
*/
private
static
Type
[]
adapterPreference
=
{
Type
.
JRE
,
Type
.
SPI
,
};
private
static
final
List
<
Type
>
adapterPreference
;
/**
* JRE Locale Data Adapter instance
...
...
@@ -129,10 +127,11 @@ public abstract class LocaleProviderAdapter {
static
{
String
order
=
AccessController
.
doPrivileged
(
new
sun
.
security
.
action
.
GetPropertyAction
(
"java.locale.providers"
));
// Override adapterPreference with the properties one
List
<
Type
>
typeList
=
new
ArrayList
<>();
// Check user specified adapter preference
if
(
order
!=
null
&&
order
.
length
()
!=
0
)
{
String
[]
types
=
order
.
split
(
","
);
List
<
Type
>
typeList
=
new
ArrayList
<>();
for
(
String
type
:
types
)
{
try
{
Type
aType
=
Type
.
valueOf
(
type
.
trim
().
toUpperCase
(
Locale
.
ROOT
));
...
...
@@ -153,18 +152,22 @@ public abstract class LocaleProviderAdapter {
LocaleServiceProviderPool
.
config
(
LocaleProviderAdapter
.
class
,
e
.
toString
());
}
}
}
if
(!
typeList
.
isEmpty
())
{
if
(!
typeList
.
contains
(
Type
.
JRE
))
{
// Append FALLBACK as the last resort.
fallbackLocaleProviderAdapter
=
new
FallbackLocaleProviderAdapter
();
typeList
.
add
(
Type
.
FALLBACK
);
}
adapterPreference
=
typeList
.
toArray
(
new
Type
[
0
]);
if
(!
typeList
.
isEmpty
())
{
if
(!
typeList
.
contains
(
Type
.
JRE
))
{
// Append FALLBACK as the last resort.
fallbackLocaleProviderAdapter
=
new
FallbackLocaleProviderAdapter
();
typeList
.
add
(
Type
.
FALLBACK
);
}
}
else
{
// Default preference list
typeList
.
add
(
Type
.
JRE
);
typeList
.
add
(
Type
.
SPI
);
}
}
adapterPreference
=
Collections
.
unmodifiableList
(
typeList
);
}
/**
* Returns the singleton instance for each adapter type
...
...
@@ -202,7 +205,7 @@ public abstract class LocaleProviderAdapter {
/**
* Returns the preference order of LocaleProviderAdapter.Type
*/
public
static
Type
[]
getAdapterPreference
()
{
public
static
List
<
Type
>
getAdapterPreference
()
{
return
adapterPreference
;
}
...
...
test/java/util/Locale/Bug8004240.java
0 → 100644
浏览文件 @
3f287fe2
/*
* Copyright (c) 2013, 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 8004240
* @summary Verify that getAdapterPreference returns an unmodifiable list.
* @compile -XDignore.symbol.file Bug8004240.java
* @run main Bug8004240
*/
import
java.util.List
;
import
sun.util.locale.provider.LocaleProviderAdapter
;
public
class
Bug8004240
{
public
static
void
main
(
String
[]
args
)
{
List
<
LocaleProviderAdapter
.
Type
>
types
=
LocaleProviderAdapter
.
getAdapterPreference
();
try
{
types
.
set
(
0
,
null
);
}
catch
(
UnsupportedOperationException
e
)
{
// success
return
;
}
throw
new
RuntimeException
(
"LocaleProviderAdapter.getAdapterPrefence() returned a modifiable list."
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录