changeset 9581:dc8e3e7356c2

8035837: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp Reviewed-by: pchelko, azvegint
author serb
date Tue, 04 Mar 2014 18:59:35 +0400
parents 1f4842051d8a
children 308e91fff2e7
files src/windows/native/sun/windows/awt_KeyEvent.cpp
diffstat 1 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_KeyEvent.cpp	Tue Mar 04 18:40:06 2014 +0400
+++ b/src/windows/native/sun/windows/awt_KeyEvent.cpp	Tue Mar 04 18:59:35 2014 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, 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
@@ -48,19 +48,28 @@
     TRY;
 
     AwtKeyEvent::keyCodeID = env->GetFieldID(cls, "keyCode", "I");
+    DASSERT(AwtKeyEvent::keyCodeID != NULL);
+    CHECK_NULL(AwtKeyEvent::keyCodeID);
+
     AwtKeyEvent::keyCharID = env->GetFieldID(cls, "keyChar", "C");
+    DASSERT(AwtKeyEvent::keyCharID != NULL);
+    CHECK_NULL(AwtKeyEvent::keyCharID);
+
     AwtKeyEvent::rawCodeID = env->GetFieldID(cls, "rawCode", "J");
+    DASSERT(AwtKeyEvent::rawCodeID != NULL);
+    CHECK_NULL(AwtKeyEvent::rawCodeID);
+
     AwtKeyEvent::primaryLevelUnicodeID = env->GetFieldID(cls, "primaryLevelUnicode", "J");
+    DASSERT(AwtKeyEvent::primaryLevelUnicodeID != NULL);
+    CHECK_NULL(AwtKeyEvent::primaryLevelUnicodeID);
+
     AwtKeyEvent::scancodeID = env->GetFieldID(cls, "scancode", "J");
+    DASSERT(AwtKeyEvent::scancodeID != NULL);
+    CHECK_NULL(AwtKeyEvent::scancodeID);
+
     AwtKeyEvent::extendedKeyCodeID = env->GetFieldID(cls, "extendedKeyCode", "J");
-
-
-    DASSERT(AwtKeyEvent::keyCodeID != NULL);
-    DASSERT(AwtKeyEvent::keyCharID != NULL);
-    DASSERT(AwtKeyEvent::rawCodeID != NULL);
-    DASSERT(AwtKeyEvent::primaryLevelUnicodeID != NULL);
-    DASSERT(AwtKeyEvent::scancodeID != NULL);
     DASSERT(AwtKeyEvent::extendedKeyCodeID != NULL);
+    CHECK_NULL(AwtKeyEvent::extendedKeyCodeID);
 
     CATCH_BAD_ALLOC;
 }