changeset 14764:4adb0d82e03a

8144074: [PIT] Crash calling Toolkit.getScreenSize() on Windows. Reviewed-by: flar
author prr
date Wed, 02 Dec 2015 09:12:39 -0800
parents 314ce60cae98
children 5d0bed389ded
files src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp test/java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java
diffstat 2 files changed, 42 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp	Mon Nov 23 15:02:19 2015 -0800
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp	Wed Dec 02 09:12:39 2015 -0800
@@ -2357,6 +2357,9 @@
 
     int width = ::GetSystemMetrics(SM_CXSCREEN);
 
+    if (!Devices::GetInstance()) {
+        Devices::UpdateInstance(env);
+    }
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice *device = devices->GetDevice(
                         AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
@@ -2376,6 +2379,10 @@
     TRY;
 
     int height = ::GetSystemMetrics(SM_CYSCREEN);
+
+    if (!Devices::GetInstance()) {
+        Devices::UpdateInstance(env);
+    }
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice *device = devices->GetDevice(
                         AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/awt/Toolkit/GetSizeTest/GetScreenSizeTest.java	Wed Dec 02 09:12:39 2015 -0800
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+/*
+  @test
+  @bug 8144074
+  @summary Crash while getting screen size during Toolkit initialisation
+  @run main/othervm GetScreenSize
+*/
+
+public class GetScreenSize {
+    public static void main(String[] args) {
+        java.awt.Toolkit.getDefaultToolkit().getScreenSize();
+    }
+}