# HG changeset patch # User bagiras # Date 1394810860 -14400 # Node ID 80eccae94bf63adc2a242814422a502ff14ae49e # Parent 64b640909fb0a0bf6693b6d2f95d2ff0acb7050c 8036782: [parfait] JNI exc. pending in jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp Reviewed-by: serb, pchelko diff -r 64b640909fb0 -r 80eccae94bf6 jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp --- a/jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp Fri Mar 14 19:20:48 2014 +0400 +++ b/jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp Fri Mar 14 19:27:40 2014 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -45,12 +45,16 @@ TRY; AwtMouseEvent::xID = env->GetFieldID(cls, "x", "I"); - AwtMouseEvent::yID = env->GetFieldID(cls, "y", "I"); - AwtMouseEvent::buttonID = env->GetFieldID(cls, "button", "I"); + DASSERT(AwtMouseEvent::xID != NULL); + CHECK_NULL(AwtMouseEvent::xID); - DASSERT(AwtMouseEvent::xID != NULL); + AwtMouseEvent::yID = env->GetFieldID(cls, "y", "I"); DASSERT(AwtMouseEvent::yID != NULL); + CHECK_NULL(AwtMouseEvent::yID); + + AwtMouseEvent::buttonID = env->GetFieldID(cls, "button", "I"); DASSERT(AwtMouseEvent::buttonID != NULL); + CHECK_NULL(AwtMouseEvent::buttonID); CATCH_BAD_ALLOC; }