From 9e93c58f146589de7901400ff1304544276f0d5d Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Fri, 28 Feb 2014 15:01:19 +0400 Subject: [PATCH] 8035839: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Label.cpp Reviewed-by: pchelko, azvegint --- jdk/src/windows/native/sun/windows/awt_Label.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_Label.cpp b/jdk/src/windows/native/sun/windows/awt_Label.cpp index 0a7d69a3013..d755d5fc68d 100644 --- a/jdk/src/windows/native/sun/windows/awt_Label.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Label.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2014, 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 @@ -319,10 +319,12 @@ Java_java_awt_Label_initIDs(JNIEnv *env, jclass cls) /* init field ids */ AwtLabel::textID = env->GetFieldID(cls, "text", "Ljava/lang/String;"); - AwtLabel::alignmentID = env->GetFieldID(cls, "alignment", "I"); - DASSERT(AwtLabel::textID != NULL); + CHECK_NULL(AwtLabel::textID); + + AwtLabel::alignmentID = env->GetFieldID(cls, "alignment", "I"); DASSERT(AwtLabel::alignmentID != NULL); + CHECK_NULL(AwtLabel::alignmentID); CATCH_BAD_ALLOC; }