--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/nio/channels/Selector/WakeupAfterClose.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2007, 2017, 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 6524172
+ * @summary Invoking wakeup on closed Selector can throw NPE if close resets interrupt status
+ */
+
+import java.io.IOException;
+import java.nio.channels.ClosedSelectorException;
+import java.nio.channels.Selector;
+
+public class WakeupAfterClose {
+
+    public static void main(String[] args) throws Exception {
+        final Selector sel = Selector.open();
+
+        Runnable r = new Runnable() {
+            public void run() {
+                try {
+                    sel.select();
+                } catch (IOException x) {
+                    x.printStackTrace();
+                } catch (ClosedSelectorException y) {
+                    System.err.println
+                        ("Caught expected ClosedSelectorException");
+                }
+            }
+        };
+
+        // start thread to block in Selector
+        Thread t = new Thread(r);
+        t.start();
+
+        // give thread time to start
+        Thread.sleep(1000);
+
+        // interrupt, close, and wakeup is the magic sequence to provoke the NPE
+        t.interrupt();
+        sel.close();
+        sel.wakeup();
+    }
+}