From 3e635157a94ced9537e25d5c6129e790fe5f7c1e Mon Sep 17 00:00:00 2001 From: Mikhail Cherkasov Date: Thu, 9 Jun 2016 13:54:48 +0300 Subject: [PATCH] 8158734: JEditorPane.createEditorKitForContentType throws NPE after 6882559 Reviewed-by: serb, aivanov --- .../classes/javax/swing/JEditorPane.java | 12 +- .../swing/JEditorPane/8158734/bug8158734.java | 115 ++++++++++++++++++ 2 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 jdk/test/javax/swing/JEditorPane/8158734/bug8158734.java diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java index 1829f16e39a..c8aad16e84e 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/JEditorPane.java @@ -1185,7 +1185,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).orElse(null); + ClassLoader loader = getKitLoaderRegistry().get(type); try { Class c; if (loader != null) { @@ -1242,7 +1242,11 @@ public class JEditorPane extends JTextComponent { */ public static void registerEditorKitForContentType(String type, String classname, ClassLoader loader) { getKitTypeRegistry().put(type, classname); - getKitLoaderRegistry().put(type, Optional.ofNullable(loader)); + if (loader != null) { + getKitLoaderRegistry().put(type, loader); + } else { + getKitLoaderRegistry().remove(type); + } getKitRegisty().remove(type); } @@ -1267,10 +1271,10 @@ public class JEditorPane extends JTextComponent { return tmp; } - private static Hashtable> getKitLoaderRegistry() { + private static Hashtable getKitLoaderRegistry() { loadDefaultKitsIfNecessary(); @SuppressWarnings("unchecked") - Hashtable> tmp = + Hashtable tmp = (Hashtable)SwingUtilities.appContextGet(kitLoaderRegistryKey); return tmp; } diff --git a/jdk/test/javax/swing/JEditorPane/8158734/bug8158734.java b/jdk/test/javax/swing/JEditorPane/8158734/bug8158734.java new file mode 100644 index 00000000000..3514303f9c3 --- /dev/null +++ b/jdk/test/javax/swing/JEditorPane/8158734/bug8158734.java @@ -0,0 +1,115 @@ +/* + * 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 8158734 + @summary JEditorPane.createEditorKitForContentType throws NPE after 6882559 + @author Mikhail Cherkasov + @run main bug8158734 +*/ + +import javax.swing.*; +import javax.swing.text.*; +import java.io.*; +import java.lang.reflect.InvocationTargetException; + + +public class bug8158734 { + + public static final String TYPE = "test/test"; + public static final String TYPE_2 = "test2/test2"; + + static boolean myClassloaderWasUsed = false; + + static class MyEditorKit extends EditorKit { + @Override + public String getContentType() { + return null; + } + + @Override + public ViewFactory getViewFactory() { + return null; + } + + @Override + public Action[] getActions() { + return new Action[0]; + } + + @Override + public Caret createCaret() { + return null; + } + + @Override + public Document createDefaultDocument() { + return null; + } + + @Override + public void read(InputStream in, Document doc, int pos) throws IOException, BadLocationException { + } + + @Override + public void write(OutputStream out, Document doc, int pos, int len) throws IOException, BadLocationException { + + } + + @Override + public void read(Reader in, Document doc, int pos) throws IOException, BadLocationException { + } + + @Override + public void write(Writer out, Document doc, int pos, int len) throws IOException, BadLocationException { + } + } + + static class MyClassloader extends ClassLoader { + @Override + public Class loadClass(String name) throws ClassNotFoundException { + myClassloaderWasUsed = true; + return super.loadClass(name); + } + } + + public static void main(String[] args) throws InvocationTargetException, InterruptedException { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + JEditorPane c = new JEditorPane(); + c.setContentType(TYPE); + + final MyClassloader loader = new MyClassloader(); + JEditorPane.registerEditorKitForContentType(TYPE_2, MyEditorKit.class.getName(), loader); + JEditorPane.registerEditorKitForContentType(TYPE_2, MyEditorKit.class.getName(), null); + JEditorPane.createEditorKitForContentType(TYPE_2); + + if (myClassloaderWasUsed) { + throw new RuntimeException("Class loader has not been removed for '" + TYPE_2 + "' type"); + } + } + }); + + } +} \ No newline at end of file