8346952 : GetGraphicsStressTest.java fails: Native resources unavailable

src/java.desktop/windows/native/libawt/windows/awt_Window.cpp

@@ -2497,33 +2497,24 @@ jint AwtWindow::_GetScreenImOn(void *param)
     JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
 
     jobject self = (jobject)param;
+    jint result = -1;
+    PDATA pData;
+    AwtWindow* w = NULL;
 
     // It's entirely possible that our native resources have been destroyed
     // before our java peer - if we're dispose()d, for instance.
-    // Alert caller w/ IllegalComponentStateException.
-    if (self == NULL) {
-        JNU_ThrowByName(env, "java/awt/IllegalComponentStateException",
-                        "Peer null in JNI");
-        return 0;
-    }
-    PDATA pData = JNI_GET_PDATA(self);
-    if (pData == NULL) {
-        JNU_ThrowByName(env, "java/awt/IllegalComponentStateException",
-                        "Native resources unavailable");
-        env->DeleteGlobalRef(self);
-        return 0;
-    }
+    // Return the default screen.
+    JNI_CHECK_PEER_GOTO(self, ret);
 
-    jint result = 0;
-    AwtWindow *w = (AwtWindow *)pData;
+    w = (AwtWindow *)pData;
     if (::IsWindow(w->GetHWnd()))
     {
         result = (jint)w->GetScreenImOn();
     }
 
+  ret:
     env->DeleteGlobalRef(self);
-
-    return result;
+    return (result != -1) ? result : AwtWin32GraphicsDevice::GetDefaultDeviceIndex();
 }
 
 void AwtWindow::_SetFocusableWindow(void *param)

test/jdk/java/awt/Frame/NotifyStressTest/NotifyStressTest.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Frame;
+
+/**
+ * @test
+ * @bug 8346952
+ * @summary Floods the EDT with updateGC() events then brutally disposes the frame.
+ * @key headful
+ */
+
+public final class NotifyStressTest {
+    static volatile Throwable failed;
+
+    public static void main(final String[] args) throws Exception {
+        Thread.setDefaultUncaughtExceptionHandler((t, e) -> failed = e);
+
+        Frame frame = new Frame();
+        frame.setSize(100, 100);
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
+
+        for (int i = 0; i < 256; i++) {
+            frame.removeNotify();
+            frame.addNotify();
+        }
+
+        frame.dispose();
+        if (failed != null) {
+            System.err.println("Test failed");
+            failed.printStackTrace();
+            throw new RuntimeException(failed);
+        }
+
+        // let the system recover from the notify flood
+        Thread.sleep(5000);
+    }
+}