From 8774e390b2c6d3bd37ab8bfefb223705a31ef567 Mon Sep 17 00:00:00 2001 From: Alexander Zvegintsev Date: Mon, 17 Mar 2014 19:44:16 +0400 Subject: [PATCH] 8036790: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp Reviewed-by: serb, pchelko --- jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp b/jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp index 23b1e93c411..1e58f2ceb8d 100644 --- a/jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2009, 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 @@ -488,11 +488,14 @@ Java_java_awt_Scrollbar_initIDs(JNIEnv *env, jclass cls) TRY; AwtScrollbar::lineIncrementID = env->GetFieldID(cls, "lineIncrement", "I"); - AwtScrollbar::pageIncrementID = env->GetFieldID(cls, "pageIncrement", "I"); - AwtScrollbar::orientationID = env->GetFieldID(cls, "orientation", "I"); - DASSERT(AwtScrollbar::lineIncrementID != NULL); + CHECK_NULL(AwtScrollbar::lineIncrementID); + + AwtScrollbar::pageIncrementID = env->GetFieldID(cls, "pageIncrement", "I"); DASSERT(AwtScrollbar::pageIncrementID != NULL); + CHECK_NULL(AwtScrollbar::pageIncrementID); + + AwtScrollbar::orientationID = env->GetFieldID(cls, "orientation", "I"); DASSERT(AwtScrollbar::orientationID != NULL); CATCH_BAD_ALLOC;