From 94d91b13828432833bf3e5a6b64b205e3faf1074 Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov <serb@openjdk.org> Date: Wed, 13 Aug 2014 21:45:53 +0400 Subject: [PATCH] 8054800: JNI exception pending in jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp Reviewed-by: azvegint, prr --- .../native/sun/windows/awt_Win32GraphicsDevice.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp index 9b10c7d275e..825a69c8c42 100644 --- a/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp @@ -835,13 +835,17 @@ Java_sun_awt_Win32GraphicsDevice_initIDs(JNIEnv *env, jclass cls) TRY; /* class ids */ - AwtWin32GraphicsDevice::indexCMClass = - (jclass)env->NewGlobalRef(env->FindClass("java/awt/image/IndexColorModel")); + jclass iCMClass = env->FindClass("java/awt/image/IndexColorModel"); + CHECK_NULL(iCMClass); + AwtWin32GraphicsDevice::indexCMClass = (jclass) env->NewGlobalRef(iCMClass); + env->DeleteLocalRef(iCMClass); DASSERT(AwtWin32GraphicsDevice::indexCMClass); CHECK_NULL(AwtWin32GraphicsDevice::indexCMClass); - AwtWin32GraphicsDevice::wToolkitClass = - (jclass)env->NewGlobalRef(env->FindClass("sun/awt/windows/WToolkit")); + jclass wTClass = env->FindClass("sun/awt/windows/WToolkit"); + CHECK_NULL(wTClass); + AwtWin32GraphicsDevice::wToolkitClass = (jclass)env->NewGlobalRef(wTClass); + env->DeleteLocalRef(wTClass); DASSERT(AwtWin32GraphicsDevice::wToolkitClass); CHECK_NULL(AwtWin32GraphicsDevice::wToolkitClass);