From eaa221b26809b67f455423fa077a9c912f7ca89c Mon Sep 17 00:00:00 2001 From: Petr Pchelko Date: Tue, 18 Mar 2014 12:30:17 +0400 Subject: [PATCH] 8036759: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp Reviewed-by: anthony, serb --- jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp b/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp index c6bd697a4ec..c1c17f9feec 100644 --- a/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp +++ b/jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp @@ -71,12 +71,16 @@ Java_java_awt_AWTEvent_initIDs(JNIEnv *env, jclass cls) TRY; AwtAWTEvent::bdataID = env->GetFieldID(cls, "bdata", "[B"); - AwtAWTEvent::idID = env->GetFieldID(cls, "id", "I"); - AwtAWTEvent::consumedID = env->GetFieldID(cls, "consumed", "Z"); - DASSERT(AwtAWTEvent::bdataID != NULL); + CHECK_NULL(AwtAWTEvent::bdataID); + + AwtAWTEvent::idID = env->GetFieldID(cls, "id", "I"); DASSERT(AwtAWTEvent::idID != NULL); + CHECK_NULL(AwtAWTEvent::idID); + + AwtAWTEvent::consumedID = env->GetFieldID(cls, "consumed", "Z"); DASSERT(AwtAWTEvent::consumedID != NULL); + CHECK_NULL(AwtAWTEvent::consumedID); CATCH_BAD_ALLOC; }