src/java.desktop/share/classes/java/awt/EventQueue.java

*** 856,874 ****
          return Toolkit.getEventQueue().getCurrentEventImpl();
      }
      private AWTEvent getCurrentEventImpl() {
          pushPopLock.lock();
          try {
!             if (fxAppThreadIsDispatchThread) {
                  return (currentEvent != null)
                          ? currentEvent.get()
                          : null;
-             } else {
-                 return (Thread.currentThread() == dispatchThread)
-                         ? currentEvent.get()
-                         : null;
              }
          } finally {
              pushPopLock.unlock();
          }
      }
  
--- 856,872 ----
          return Toolkit.getEventQueue().getCurrentEventImpl();
      }
      private AWTEvent getCurrentEventImpl() {
          pushPopLock.lock();
          try {
!             if (Thread.currentThread() == dispatchThread
!                     || fxAppThreadIsDispatchThread) {
                  return (currentEvent != null)
                          ? currentEvent.get()
                          : null;
              }
+             return null;
          } finally {
              pushPopLock.unlock();
          }
      }