infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-23 00:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

8376169: JPopupMenu.setInvoker(null) causes NPE

Browse Source 
Reviewed-by: aivanov, azvegint, prr, kizune
This commit is contained in:
Prasanta Sadhukhan 2026-01-29 02:30:41 +00:00
parent 09ed8e66dc
commit 2529e2fe8d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.desktop/share/classes/javax/swing/JPopupMenu.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2026, 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
@ -960,7 +960,9 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
if (oldInvoker != null) {
oldInvoker.removePropertyChangeListener("ancestor", propListener);
}
invoker.addPropertyChangeListener("ancestor", propListener);
if (invoker != null) {
invoker.addPropertyChangeListener("ancestor", propListener);
}
ui.installUI(this);
}
invalidate();

12
test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, 2026, 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
@ -23,13 +23,14 @@
/*
* @test
* @bug 4938801
* @bug 4938801 8376169
* @key headful
* @summary Verifies popup is removed when the component is removed
* @run main TestPopupInvoker
*/
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Container;
import java.awt.Robot;
import java.util.concurrent.CountDownLatch;
@ -48,6 +49,7 @@ public class TestPopupInvoker {
static JFrame frame;
static JLabel label;
static Container pane;
static volatile Component invoker;
private static final CountDownLatch popupShown = new CountDownLatch(1);
private static final CountDownLatch popupHidden = new CountDownLatch(1);
@ -73,6 +75,7 @@ public class TestPopupInvoker {
@Override
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
popupHidden.countDown();
popupMenu.setInvoker(null);
}
@Override
@ -106,6 +109,11 @@ public class TestPopupInvoker {
if (!popupHidden.await(1, SECONDS)) {
throw new RuntimeException("Popup is visible after component is removed");
}
SwingUtilities.invokeAndWait(() -> invoker = popupMenu.getInvoker());
if (invoker != null) {
throw new RuntimeException("Invoker is not null");
}
} finally {
SwingUtilities.invokeAndWait(() -> {
if (frame != null) {