8036782: [parfait] JNI exc. pending in jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp
Reviewed-by: serb, pchelko
--- 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;
}