8190456: sanity/client/SwingSet/src/ComboBoxDemoTest.java failed with NPE from java.awt.EventQueue.getCurrentEventImpl()

Reviewed-by: serb, psadhukhan
2017-11-09 15:32:52 +05:30 · 2017-11-09 15:32:52 +05:30 · 362d39e670
commit 362d39e670
parent e1e58fe2de
1 changed files with 3 additions and 5 deletions
--- a/src/java.desktop/share/classes/java/awt/EventQueue.java
+++ b/src/java.desktop/share/classes/java/awt/EventQueue.java
@ -858,15 +858,13 @@ public class EventQueue {
    private AWTEvent getCurrentEventImpl() {
        pushPopLock.lock();
        try {
-            if (fxAppThreadIsDispatchThread) {
+            if (Thread.currentThread() == dispatchThread
+                    || fxAppThreadIsDispatchThread) {
                return (currentEvent != null)
                        ? currentEvent.get()
                        : null;
-            } else {
-                return (Thread.currentThread() == dispatchThread)
-                        ? currentEvent.get()
-                        : null;
            }
+            return null;
        } finally {
            pushPopLock.unlock();
        }