8035839: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Label.cpp
Reviewed-by: pchelko, azvegint
--- a/jdk/src/windows/native/sun/windows/awt_Label.cpp Thu Feb 27 11:56:24 2014 -0800
+++ b/jdk/src/windows/native/sun/windows/awt_Label.cpp Fri Feb 28 15:01:19 2014 +0400
@@ -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 @@
/* 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);
- DASSERT(AwtLabel::textID != NULL);
+ AwtLabel::alignmentID = env->GetFieldID(cls, "alignment", "I");
DASSERT(AwtLabel::alignmentID != NULL);
+ CHECK_NULL(AwtLabel::alignmentID);
CATCH_BAD_ALLOC;
}