8036760: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
authorserb
Fri, 07 Mar 2014 20:19:55 +0400
changeset 23630 5e8ec2d6e2db
parent 23629 eab9fe49607d
child 23631 f6652dee742c
8036760: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Checkbox.cpp Reviewed-by: pchelko, azvegint
jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Checkbox.cpp	Fri Mar 07 19:45:56 2014 +0400
+++ b/jdk/src/windows/native/sun/windows/awt_Checkbox.cpp	Fri Mar 07 20:19:55 2014 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, 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
@@ -558,13 +558,15 @@
 
     AwtCheckbox::labelID =
       env->GetFieldID(cls, "label", "Ljava/lang/String;");
+    DASSERT(AwtCheckbox::labelID != NULL);
+    CHECK_NULL(AwtCheckbox::labelID);
+
     AwtCheckbox::groupID =
       env->GetFieldID(cls, "group", "Ljava/awt/CheckboxGroup;");
-    AwtCheckbox::stateID =
-      env->GetFieldID(cls, "state", "Z");
+    DASSERT(AwtCheckbox::groupID != NULL);
+    CHECK_NULL(AwtCheckbox::groupID);
 
-    DASSERT(AwtCheckbox::labelID != NULL);
-    DASSERT(AwtCheckbox::groupID != NULL);
+    AwtCheckbox::stateID = env->GetFieldID(cls, "state", "Z");
     DASSERT(AwtCheckbox::stateID != NULL);
 
     CATCH_BAD_ALLOC;