changeset 9591:dcfa21d68c1e

8036792: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Menu.cpp Reviewed-by: pchelko, azvegint
author serb
date Thu, 06 Mar 2014 22:33:21 +0400
parents 0a574bcd66a7
children 5798f02d7701
files src/windows/native/sun/windows/awt_Menu.cpp
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Menu.cpp	Thu Mar 06 17:13:55 2014 +0400
+++ b/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;