提交 56e7b735 编写于 作者: D dcherepanov

6857363: deadlock caused by sun.awt.X11.XTrayIconPeer$Tooltip.display

Reviewed-by: ant, art
上级 b6581016
...@@ -189,6 +189,13 @@ public abstract class InfoWindow extends Window { ...@@ -189,6 +189,13 @@ public abstract class InfoWindow extends Window {
* WARNING: this method is executed on Toolkit thread! * WARNING: this method is executed on Toolkit thread!
*/ */
private void display() { private void display() {
// Execute on EDT to avoid deadlock (see 6280857).
SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
public void run() {
if (liveArguments.isDisposed()) {
return;
}
String tooltipString = liveArguments.getTooltipString(); String tooltipString = liveArguments.getTooltipString();
if (tooltipString == null) { if (tooltipString == null) {
return; return;
...@@ -198,12 +205,6 @@ public abstract class InfoWindow extends Window { ...@@ -198,12 +205,6 @@ public abstract class InfoWindow extends Window {
textLabel.setText(tooltipString); textLabel.setText(tooltipString);
} }
// Execute on EDT to avoid deadlock (see 6280857).
SunToolkit.executeOnEventHandlerThread(target, new Runnable() {
public void run() {
if (liveArguments.isDisposed()) {
return;
}
Point pointer = (Point)AccessController.doPrivileged(new PrivilegedAction() { Point pointer = (Point)AccessController.doPrivileged(new PrivilegedAction() {
public Object run() { public Object run() {
if (!isPointerOverTrayIcon(liveArguments.getBounds())) { if (!isPointerOverTrayIcon(liveArguments.getBounds())) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册