Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
6c92b692
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看板
提交
6c92b692
编写于
10月 02, 2012
作者:
P
psandoz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7197642: (sl) ServiceLoader.load(null) doesn't throw NPE
Reviewed-by: alanb
上级
afc47100
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
68 addition
and
1 deletion
+68
-1
src/share/classes/java/util/ServiceLoader.java
src/share/classes/java/util/ServiceLoader.java
+1
-1
test/java/util/ServiceLoader/NPE.java
test/java/util/ServiceLoader/NPE.java
+67
-0
未找到文件。
src/share/classes/java/util/ServiceLoader.java
浏览文件 @
6c92b692
...
...
@@ -213,7 +213,7 @@ public final class ServiceLoader<S>
}
private
ServiceLoader
(
Class
<
S
>
svc
,
ClassLoader
cl
)
{
service
=
svc
;
service
=
Objects
.
requireNonNull
(
svc
,
"Service interface cannot be null"
)
;
loader
=
cl
;
reload
();
}
...
...
test/java/util/ServiceLoader/NPE.java
0 → 100644
浏览文件 @
6c92b692
/*
* 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 7197642
* @summary test ServiceLoader.load methods for NullPointerException.
*/
import
java.util.ServiceLoader
;
import
java.util.Arrays
;
public
final
class
NPE
{
static
abstract
class
Test
{
String
name
;
Test
(
String
name
)
{
this
.
name
=
name
;
}
abstract
void
run
();
}
static
Test
load
=
new
Test
(
"ServiceLoader.load(null)"
)
{
void
run
()
{
ServiceLoader
.
load
(
null
);
}
};
static
Test
loadWithClassLoader
=
new
Test
(
"ServiceLoader.load(null, loader)"
)
{
void
run
()
{
ServiceLoader
.
load
(
null
,
NPE
.
class
.
getClassLoader
());
}
};
static
Test
loadInstalled
=
new
Test
(
"ServiceLoader.loadInstalled(null)"
)
{
void
run
()
{
ServiceLoader
.
loadInstalled
(
null
);
}
};
public
static
void
main
(
String
[]
args
)
throws
Exception
{
for
(
Test
t
:
Arrays
.
asList
(
load
,
loadWithClassLoader
,
loadInstalled
))
{
NullPointerException
caught
=
null
;
try
{
t
.
run
();
}
catch
(
NullPointerException
e
)
{
caught
=
e
;
}
if
(
caught
==
null
)
{
throw
new
RuntimeException
(
"NullPointerException expected for method invocation of "
+
t
.
name
);
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录