From c54bca6f7f5a7e4f47e804608e7ea370dcc32897 Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <honkar@openjdk.org>
Date: Fri, 12 Jan 2024 19:21:52 +0000
Subject: [PATCH] 8323617: Add missing null checks to
 GetMousePositionWithPopup.java test

Reviewed-by: serb, aivanov, dnguyen
---
 .../GetMousePositionWithPopup.java                   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
index 452054a8f11..5bfadc6fbe7 100644
--- a/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
+++ b/test/jdk/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, 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
@@ -94,9 +94,13 @@ public class GetMousePositionWithPopup {
             robot.mouseMove(MOUSE_POS3, MOUSE_POS3);
             syncLocationToWindowManager();
         } finally {
-            SwingUtilities.invokeLater(() -> {
-                frame1.dispose();
-                frame2.dispose();
+            SwingUtilities.invokeAndWait(() -> {
+                if (frame1 != null) {
+                    frame1.dispose();
+                }
+                if (frame2 != null) {
+                    frame2.dispose();
+                }
             });
         }
     }