Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
f3e3f33e
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看板
提交
f3e3f33e
编写于
5月 18, 2016
作者:
M
mcherkas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6882559: new JEditorPane("text/plain","") fails for null context class loader
Reviewed-by: serb, aivanov
上级
49a2a602
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
6 deletion
+44
-6
src/share/classes/javax/swing/JEditorPane.java
src/share/classes/javax/swing/JEditorPane.java
+3
-6
test/javax/swing/JEditorPane/6882559/bug6882559.java
test/javax/swing/JEditorPane/6882559/bug6882559.java
+41
-0
未找到文件。
src/share/classes/javax/swing/JEditorPane.java
浏览文件 @
f3e3f33e
...
...
@@ -24,15 +24,12 @@
*/
package
javax.swing
;
import
sun.swing.SwingUtilities2
;
import
java.awt.*
;
import
java.awt.event.*
;
import
java.lang.reflect.*
;
import
java.net.*
;
import
java.util.*
;
import
java.io.*
;
import
java.util.*
;
import
javax.swing.plaf.*
;
import
javax.swing.text.*
;
...
...
@@ -1187,7 +1184,7 @@ public class JEditorPane extends JTextComponent {
if
(
k
==
null
)
{
// try to dynamically load the support
String
classname
=
getKitTypeRegistry
().
get
(
type
);
ClassLoader
loader
=
getKitLoaderRegistry
().
get
(
type
);
ClassLoader
loader
=
getKitLoaderRegistry
().
get
(
type
)
.
orElse
(
null
)
;
try
{
Class
c
;
if
(
loader
!=
null
)
{
...
...
@@ -1244,7 +1241,7 @@ public class JEditorPane extends JTextComponent {
*/
public
static
void
registerEditorKitForContentType
(
String
type
,
String
classname
,
ClassLoader
loader
)
{
getKitTypeRegistry
().
put
(
type
,
classname
);
getKitLoaderRegistry
().
put
(
type
,
loader
);
getKitLoaderRegistry
().
put
(
type
,
Optional
.
ofNullable
(
loader
)
);
getKitRegisty
().
remove
(
type
);
}
...
...
@@ -1265,7 +1262,7 @@ public class JEditorPane extends JTextComponent {
return
(
Hashtable
)
SwingUtilities
.
appContextGet
(
kitTypeRegistryKey
);
}
private
static
Hashtable
<
String
,
ClassLoader
>
getKitLoaderRegistry
()
{
private
static
Hashtable
<
String
,
Optional
<
ClassLoader
>
>
getKitLoaderRegistry
()
{
loadDefaultKitsIfNecessary
();
return
(
Hashtable
)
SwingUtilities
.
appContextGet
(
kitLoaderRegistryKey
);
}
...
...
test/javax/swing/JEditorPane/6882559/bug6882559.java
0 → 100644
浏览文件 @
f3e3f33e
/*
* Copyright (c) 2016, 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 6882559
@summary new JEditorPane("text/plain","") fails for null context class loader
@author Mikhail Cherkasov
@run main bug6882559
*/
import
javax.swing.*
;
public
class
bug6882559
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
SwingUtilities
.
invokeAndWait
(()
->
{
Thread
.
currentThread
().
setContextClassLoader
(
null
);
new
javax
.
swing
.
JEditorPane
(
"text/plain"
,
""
);
});
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录