From 9b8ca9477cb78d0db92813ae6e41c4fc3c77cdda Mon Sep 17 00:00:00 2001
From: azvegint <unknown>
Date: Fri, 12 May 2017 17:36:21 +0300
Subject: [PATCH] 8178996: [macos] JComboBox doesn't display popup in mixed
 JavaFX Swing Application on 8u131 and Mac OS 10.12 Reviewed-by: serb,
 ssadetsky

---
 .../classes/sun/lwawt/macosx/CPlatformWindow.java   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
index 539ea8894..32ef49d93 100644
--- a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
@@ -251,13 +251,18 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
         }
         AtomicLong ref = new AtomicLong();
         contentView.execute(viewPtr -> {
+            boolean hasOwnerPtr = false;
+
             if (owner != null) {
-                owner.execute(ownerPtr -> {
+                hasOwnerPtr = 0L != owner.executeGet(ownerPtr -> {
                     ref.set(nativeCreateNSWindow(viewPtr, ownerPtr, styleBits,
-                                                 bounds.x, bounds.y,
-                                                 bounds.width, bounds.height));
+                                                    bounds.x, bounds.y,
+                                                    bounds.width, bounds.height));
+                    return 1;
                 });
-            } else {
+            }
+
+            if (!hasOwnerPtr) {
                 ref.set(nativeCreateNSWindow(viewPtr, 0,
                                              styleBits, bounds.x, bounds.y,
                                              bounds.width, bounds.height));
-- 
GitLab