From b588d51d85eaceca51632fe9d0cfd992197f0b5a Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <prasanta.sadhukhan@oracle.com>
Date: Wed, 28 Jan 2026 06:58:26 +0000
Subject: [PATCH] Test update

---
 src/java.desktop/share/classes/javax/swing/JPopupMenu.java | 1 -
 test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java      | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index 16319d23a47..1b04e8c6169 100644
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -966,7 +966,6 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
             ui.installUI(this);
         }
         invalidate();
-
     }
 
     /**
diff --git a/test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java b/test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java
index 1178b2b823c..49a444eb6df 100644
--- a/test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java
+++ b/test/jdk/javax/swing/JPopupMenu/TestPopupInvoker.java
@@ -30,6 +30,7 @@
  */
 
 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);
@@ -107,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) {