archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Reviewed-by: serb, psadhukhan
This commit is contained in:
Abdul Kolarkunnu 2017-11-09 15:32:52 +05:30
parent e1e58fe2de
commit 362d39e670
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.desktop/share/classes/java/awt/EventQueue.java
View file

@ -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();
}