From e7f5dbd07afe99bc7556ad2cb092acd6922ff91c Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Thu, 6 Mar 2014 22:33:21 +0400 Subject: [PATCH] 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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_Menu.cpp b/jdk/src/windows/native/sun/windows/awt_Menu.cpp index ff428f20c8e..8bea41c88e3 100644 --- a/jdk/src/windows/native/sun/windows/awt_Menu.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Menu.cpp @@ -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 @@ Java_java_awt_Menu_initIDs(JNIEnv *env, jclass cls) 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;