From cb1d25fcfafaa714d3f4dfd600c7dc7c936f8c5e Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Thu, 11 Jan 2024 08:13:28 +0000 Subject: [PATCH] 8323330: [BACKOUT] JDK-8276809: java/awt/font/JNICheck/FreeTypeScalerJNICheck.java shows JNI warning on Windows Reviewed-by: prr, stuefe --- .../native/libawt/windows/awt_Win32GraphicsEnv.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp index 7dac7b17b1b..6c949b564e9 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp +++ b/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2023, 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 @@ -126,15 +126,9 @@ BOOL DWMIsCompositionEnabled() { dwmIsCompositionEnabled = bRes; JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); - jboolean hasException; - JNU_CallStaticMethodByName(env, &hasException, + JNU_CallStaticMethodByName(env, NULL, "sun/awt/Win32GraphicsEnvironment", "dwmCompositionChanged", "(Z)V", (jboolean)bRes); - if (hasException) { - J2dTraceLn(J2D_TRACE_INFO, "Exception occurred in DWMIsCompositionEnabled"); - env->ExceptionDescribe(); - env->ExceptionClear(); - } return bRes; }