Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 8978:a2a8627a66cd
6882559: new JEditorPane("text/plain","") fails for null context class loader
Reviewed-by: serb, aivanov
author | mcherkas |
---|---|
date | Fri, 14 Oct 2016 05:56:55 +0100 |
parents | 3279d0117508 |
children | f0d6bb6a4fed |
files | src/share/classes/javax/swing/JEditorPane.java test/javax/swing/JEditorPane/6882559/bug6882559.java |
diffstat | 2 files changed, 152 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/javax/swing/JEditorPane.java Thu Aug 27 13:25:11 2015 +0200 +++ b/src/share/classes/javax/swing/JEditorPane.java Fri Oct 14 05:56:55 2016 +0100 @@ -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 @@ 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 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 @@ return (Hashtable)SwingUtilities.appContextGet(kitTypeRegistryKey); } - private static Hashtable<String, ClassLoader> getKitLoaderRegistry() { + private static Hashtable<String, Optional<ClassLoader>> getKitLoaderRegistry() { loadDefaultKitsIfNecessary(); return (Hashtable)SwingUtilities.appContextGet(kitLoaderRegistryKey); } @@ -2407,4 +2404,110 @@ } } + private static final class Optional<T> { + /** + * Common instance for {@code empty()}. + */ + private static final Optional<?> EMPTY = new Optional<>(); + + /** + * If non-null, the value; if null, indicates no value is present + */ + private final T value; + + /** + * Constructs an empty instance. + * + * @implNote Generally only one empty instance, {@link Optional#EMPTY}, + * should exist per VM. + */ + private Optional() { + this.value = null; + } + + /** + * Returns an empty {@code Optional} instance. No value is present for this + * Optional. + * + * @apiNote Though it may be tempting to do so, avoid testing if an object + * is empty by comparing with {@code ==} against instances returned by + * {@code Option.empty()}. There is no guarantee that it is a singleton. + * Instead, use {@link #isPresent()}. + * + * @param <T> Type of the non-existent value + * @return an empty {@code Optional} + */ + public static<T> Optional<T> empty() { + @SuppressWarnings("unchecked") + Optional<T> t = (Optional<T>) EMPTY; + return t; + } + + /** + * Constructs an instance with the value present. + * + * @param value the non-null value to be present + * @throws NullPointerException if value is null + */ + private Optional(T value) { + this.value = Objects.requireNonNull(value); + } + + /** + * Returns an {@code Optional} with the specified present non-null value. + * + * @param <T> the class of the value + * @param value the value to be present, which must be non-null + * @return an {@code Optional} with the value present + * @throws NullPointerException if value is null + */ + public static <T> Optional<T> of(T value) { + return new Optional<T>(value); + } + + /** + * Returns an {@code Optional} describing the specified value, if non-null, + * otherwise returns an empty {@code Optional}. + * + * @param <T> the class of the value + * @param value the possibly-null value to describe + * @return an {@code Optional} with a present value if the specified value + * is non-null, otherwise an empty {@code Optional} + */ + public static <T> Optional<T> ofNullable(T value) { + if (value == null) { + return empty(); + } else { + return of(value); + } + } + + /** + * If a value is present in this {@code Optional}, returns the value, + * otherwise throws {@code NoSuchElementException}. + * + * @return the non-null value held by this {@code Optional} + * @throws NoSuchElementException if there is no value present + * + * @see Optional#isPresent() + */ + public T get() { + if (value == null) { + throw new NoSuchElementException("No value present"); + } + return value; + } + + /** + * Return the value if present, otherwise return {@code other}. + * + * @param other the value to be returned if there is no value present, may + * be null + * @return the value, if present, otherwise {@code other} + */ + public T orElse(T other) { + return value != null ? value : other; + } + } + }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JEditorPane/6882559/bug6882559.java Fri Oct 14 05:56:55 2016 +0100 @@ -0,0 +1,43 @@ +/* + * 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(new Runnable() { + public void run() { + Thread.currentThread().setContextClassLoader(null); + new javax.swing.JEditorPane("text/plain", ""); + } + }); + } +}