commit df11dcc97bb5556ac5d0299b773a512b4f0bb5bb
author Anton Tarasov <anton.tarasov@jetbrains.com> Mon Feb 13 18:35:33 2017 +0300
committer Anton Tarasov <anton.tarasov@jetbrains.com> Mon Feb 13 19:02:04 2017 +0300
tree 91b4a6950402495531bb187a5a245d3264e87ef2
parent d20116bd409b5c20926fd2cb548f8313b9057b1a

JRE-225 [macos] IDEA hangs on attempt to call getDefaultScreenDevice() from EDT

(cherry picked from commit 76aba25)

src/share/classes/sun/swing/SwingUtilities2.java

diff --git a/src/share/classes/sun/swing/SwingUtilities2.java b/src/share/classes/sun/swing/SwingUtilities2.java
index b5dc276..53ef0fc 100644
--- a/src/share/classes/sun/swing/SwingUtilities2.java
+++ b/src/share/classes/sun/swing/SwingUtilities2.java
@@ -1162,7 +1162,8 @@
         if (c != null) {
             GraphicsConfiguration gc = c.getGraphicsConfiguration();
             AffineTransform tx = (gc == null) ? null : gc.getDefaultTransform();
-            if (tx == null && !GraphicsEnvironment.isHeadless()) {
+            // [tav] workaround deadlock on MacOSX until fixed, JRE-226
+            if (!FontUtilities.isMacOSX && tx == null && !GraphicsEnvironment.isHeadless()) {
                 tx =  GraphicsEnvironment
                         .getLocalGraphicsEnvironment()
                         .getDefaultScreenDevice()