stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8166673: The new implementation of Robot.waitForIdle() may hang

Browse Source 
Reviewed-by: azvegint, ssadetsky
This commit is contained in:
Sergey Bylokhov 2016-10-18 18:00:22 +03:00
parent 626e2ca286
commit e5579cb9b0
2 changed files with 71 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java
View File

@ -1512,9 +1512,9 @@ public abstract class SunToolkit extends Toolkit
*/
protected abstract boolean syncNativeQueue(final long timeout);
private boolean eventDispatched = false;
private boolean queueEmpty = false;
private final Object waitLock = "Wait Lock";
private boolean eventDispatched;
private boolean queueEmpty;
private final Object waitLock = new Object();
private boolean isEQEmpty() {
EventQueue queue = getSystemEventQueueImpl();
@ -1531,10 +1531,11 @@ public abstract class SunToolkit extends Toolkit
@SuppressWarnings("serial")
protected final boolean waitForIdle(final long timeout) {
flushPendingEvents();
boolean queueWasEmpty = isEQEmpty();
queueEmpty = false;
eventDispatched = false;
synchronized(waitLock) {
final boolean queueWasEmpty;
synchronized (waitLock) {
queueWasEmpty = isEQEmpty();
queueEmpty = false;
eventDispatched = false;
postEvent(AppContext.getAppContext(),
new PeerEvent(getSystemEventQueueImpl(), null, PeerEvent.LOW_PRIORITY_EVENT) {
@Override

63
jdk/test/java/awt/Robot/WaitForIdleSyncroizedOnString/WaitForIdleSyncroizedOnString.java Normal file
View File

@ -0,0 +1,63 @@
/*
* 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.
*/
import java.awt.Robot;
import java.util.concurrent.CountDownLatch;
import javax.swing.SwingUtilities;
/**
* @test
* @key headful
* @bug 8166673
*/
public final class WaitForIdleSyncroizedOnString {
private static final String WAIT_LOCK = "Wait Lock";
private static volatile boolean passed = true;
public static void main(final String[] args) throws Exception {
CountDownLatch go = new CountDownLatch(1);
Robot r = new Robot();
SwingUtilities.invokeLater(() -> System.out.println("some work"));
Thread t = new Thread(() -> {
synchronized (WAIT_LOCK) {
go.countDown();
try {
Thread.sleep(30000);
passed = false;
} catch (InterruptedException e) {
System.out.println("e = " + e);
}
}
});
t.start();
go.await();
r.waitForIdle();
t.interrupt();
if (!passed) {
throw new RuntimeException("Test failed");
}
}
}