Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk

changeset 9289:6f4ae5683b93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8035844: [parfait] JNI exception pending in src/windows/native/sun/windows/awt_Rectangle.cpp Reviewed-by: anthony, serb
author pchelko
date Mon, 31 Mar 2014 14:33:11 +0400
parents de395dde0d4e
children 6ce6cf32d30f
files src/windows/native/sun/windows/awt_Rectangle.cpp
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Rectangle.cpp	Mon Mar 31 14:28:47 2014 +0400
+++ b/src/windows/native/sun/windows/awt_Rectangle.cpp	Mon Mar 31 14:33:11 2014 +0400
@@ -46,14 +46,20 @@
     TRY;
 
     AwtRectangle::xID = env->GetFieldID(cls, "x", "I");
+    DASSERT(AwtRectangle::xID != NULL);
+    CHECK_NULL(AwtRectangle::xID);
+
     AwtRectangle::yID = env->GetFieldID(cls, "y", "I");
-    AwtRectangle::widthID = env->GetFieldID(cls, "width", "I");
-    AwtRectangle::heightID = env->GetFieldID(cls, "height", "I");
+    DASSERT(AwtRectangle::yID != NULL);
+    CHECK_NULL(AwtRectangle::yID);
 
-    DASSERT(AwtRectangle::xID != NULL);
-    DASSERT(AwtRectangle::yID != NULL);
+    AwtRectangle::widthID = env->GetFieldID(cls, "width", "I");
     DASSERT(AwtRectangle::widthID != NULL);
+    CHECK_NULL(AwtRectangle::widthID);
+
+    AwtRectangle::heightID = env->GetFieldID(cls, "height", "I");
     DASSERT(AwtRectangle::heightID != NULL);
+    CHECK_NULL(AwtRectangle::heightID);
 
     CATCH_BAD_ALLOC;
 }