--- a/src/share/classes/javax/swing/JEditorPane.java	Tue Dec 06 12:50:50 2016 +0000
+++ b/src/share/classes/javax/swing/JEditorPane.java	Tue Dec 06 12:57:38 2016 +0000
@@ -1242,7 +1242,7 @@
         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) {
@@ -1299,7 +1299,11 @@
      */
     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);
     }
 
@@ -1320,7 +1324,7 @@
         return (Hashtable)SwingUtilities.appContextGet(kitTypeRegistryKey);
     }
 
-    private static Hashtable<String, Optional<ClassLoader>> getKitLoaderRegistry() {
+    private static Hashtable<String, ClassLoader> getKitLoaderRegistry() {
         loadDefaultKitsIfNecessary();
         return (Hashtable)SwingUtilities.appContextGet(kitLoaderRegistryKey);
     }
@@ -2465,131 +2469,4 @@
     }
  }
 
-    private static final class Optional<T> {
-        /**
-         * Common instance for {@code empty()}.
-         */
-        private static final Optional<?> EMPTY = new Optional<Object>();
-
-        /**
-         * 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 = 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;
-        }
-
-        /**
-	 * Checks that the specified object reference is not {@code null}. This
-	 * method is designed primarily for doing parameter validation in methods
-	 * and constructors, as demonstrated below:
-	 * <blockquote><pre>
-	 * public Foo(Bar bar) {
-	 *     this.bar = Objects.requireNonNull(bar);
-	 * }
-	 * </pre></blockquote>
-	 *
-	 * @param obj the object reference to check for nullity
-	 * @param <T> the type of the reference
-	 * @return {@code obj} if not {@code null}
-	 * @throws NullPointerException if {@code obj} is {@code null}
-	 */
-	private static <T> T requireNonNull(T obj) {
-	    if (obj == null)
-		throw new NullPointerException();
-	    return obj;
-	}
-    }
-
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/javax/swing/JEditorPane/8158734/bug8158734.java	Tue Dec 06 12:57:38 2016 +0000
@@ -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