8247163: JFXPanel throws exception on click when no Scene is set

Reviewed-by: kcr
openjdk · Jun 17, 2020 · 1727dfa · 1727dfa
1 parent 54e2507
commit 1727dfa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java b/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java
@@ -449,8 +449,10 @@ protected void processMouseEvent(MouseEvent e) {
                 // The extra simulated mouse pressed event is removed by making the JavaFX scene focused.
                 // It is safe, because in JavaFX only the method "setFocused(true)" is called,
                 // which doesn't have any side-effects when called multiple times.
-                int focusCause = AbstractEvents.FOCUSEVENT_ACTIVATED;
-                stagePeer.setFocused(true, focusCause);
+                if (stagePeer != null) {
+                    int focusCause = AbstractEvents.FOCUSEVENT_ACTIVATED;
+                    stagePeer.setFocused(true, focusCause);
+                }
             }
         }
 

diff --git a/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelTest.java b/tests/system/src/test/java/test/javafx/embed/swing/JFXPanelTest.java
@@ -137,5 +137,23 @@ public void testNoDoubleClickOnFirstClick() throws Exception {
 
         Assert.assertEquals(1, pressedEventCounter[0]);
     }
+
+    @Test
+    public void testClickOnEmptyJFXPanel() throws Exception {
+        CountDownLatch firstPressedEventLatch = new CountDownLatch(1);
+
+        SwingUtilities.invokeLater(() -> {
+            TestFXPanel fxPnl = new TestFXPanel();
+
+            MouseEvent e = new MouseEvent(fxPnl, MouseEvent.MOUSE_PRESSED, 0, MouseEvent.BUTTON1_DOWN_MASK,
+                    5, 5, 1, false, MouseEvent.BUTTON1);
+
+            fxPnl.processMouseEventPublic(e);
+
+            firstPressedEventLatch.countDown();
+        });
+
+        Assert.assertTrue(firstPressedEventLatch.await(5000, TimeUnit.MILLISECONDS));
+    }
 }