8036792: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Menu.cpp
authorserb
Thu, 06 Mar 2014 22:33:21 +0400
changeset 23628 158574ce42ec
parent 23627 f578c6ea3c8d
child 23629 eab9fe49607d
8036792: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Menu.cpp Reviewed-by: pchelko, azvegint
jdk/src/windows/native/sun/windows/awt_Menu.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Menu.cpp	Thu Mar 06 17:13:55 2014 +0400
+++ b/jdk/src/windows/native/sun/windows/awt_Menu.cpp	Thu Mar 06 22:33:21 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
@@ -351,10 +351,11 @@
     TRY;
 
     AwtMenu::countItemsMID = env->GetMethodID(cls, "countItemsImpl", "()I");
+    DASSERT(AwtMenu::countItemsMID != NULL);
+    CHECK_NULL(AwtMenu::countItemsMID);
+
     AwtMenu::getItemMID = env->GetMethodID(cls, "getItemImpl",
                                            "(I)Ljava/awt/MenuItem;");
-
-    DASSERT(AwtMenu::countItemsMID != NULL);
     DASSERT(AwtMenu::getItemMID != NULL);
 
     CATCH_BAD_ALLOC;