stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6882559: new JEditorPane("text/plain","") fails for null context class loader

Browse Source 
Reviewed-by: serb, aivanov
This commit is contained in:
Mikhail Cherkasov 2016-05-18 18:35:54 +03:00
parent 2de846fa45
commit 49f26d74b4
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java
View File

@ -1186,7 +1186,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) {
@ -1243,7 +1243,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);
}
@ -1268,10 +1268,10 @@ public class JEditorPane extends JTextComponent {
return tmp;
}
private static Hashtable<String, ClassLoader> getKitLoaderRegistry() {
private static Hashtable<String, Optional<ClassLoader>> getKitLoaderRegistry() {
loadDefaultKitsIfNecessary();
@SuppressWarnings("unchecked")
Hashtable<String, ClassLoader> tmp =
Hashtable<String, Optional<ClassLoader>> tmp =
(Hashtable)SwingUtilities.appContextGet(kitLoaderRegistryKey);
return tmp;
}

41
jdk/test/javax/swing/JEditorPane/6882559/bug6882559.java Normal file
View File

@ -0,0 +1,41 @@
/*
* 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", "");
});
}
}