From 0dccaa3eb370683be76f5d9fbfca96582469be67 Mon Sep 17 00:00:00 2001 From: Alexander Zvegintsev Date: Mon, 17 Mar 2014 19:38:34 +0400 Subject: [PATCH] 8036783: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_MenuBar.cpp Reviewed-by: serb, pchelko --- jdk/src/windows/native/sun/windows/awt_MenuBar.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_MenuBar.cpp b/jdk/src/windows/native/sun/windows/awt_MenuBar.cpp index 82f537043ba..c600d8d36ac 100644 --- a/jdk/src/windows/native/sun/windows/awt_MenuBar.cpp +++ b/jdk/src/windows/native/sun/windows/awt_MenuBar.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 @@ -268,9 +268,11 @@ Java_java_awt_MenuBar_initIDs(JNIEnv *env, jclass cls) TRY; AwtMenuBar::getMenuCountMID = env->GetMethodID(cls, "getMenuCountImpl", "()I"); + DASSERT(AwtMenuBar::getMenuCountMID != NULL); + CHECK_NULL(AwtMenuBar::getMenuCountMID); + AwtMenuBar::getMenuMID = env->GetMethodID(cls, "getMenuImpl", "(I)Ljava/awt/Menu;"); - DASSERT(AwtMenuBar::getMenuCountMID != NULL); DASSERT(AwtMenuBar::getMenuMID != NULL); CATCH_BAD_ALLOC;