test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp

rev 52100 : 8212083: Handle remaining gc/lock native code and fix two strings
Summary:
Reviewed-by:

*** 21,30 ****
--- 21,31 ----
   * questions.
   */
  #include <jni.h>
  #include <stdio.h>
  #include <time.h>
+ #include "ExceptionCheckingJniEnv.hpp"
  #include "jni_tools.h"
  
  extern "C" {
  
  static jfieldID objFieldId = NULL;
*** 33,65 ****
   * Class:     nsk_share_gc_lock_jniref_JNIWeakGlobalRefLocker
   * Method:    criticalNative
   * Signature: (JJ)V
   */
  JNIEXPORT void JNICALL Java_nsk_share_gc_lock_jniref_JNIWeakGlobalRefLocker_criticalNative
!   (JNIEnv *env, jobject o, jlong enterTime, jlong sleepTime) {
          jobject obj;
          jobject gref;
          time_t start_time, current_time;
  
          if (objFieldId == NULL) {
                  jclass klass = env->GetObjectClass(o);
-                 if (klass == NULL) {
-                         printf("Error: GetObjectClass returned NULL\n");
-                         return;
-                 }
                  objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
-                 if (objFieldId == NULL) {
-                         printf("Error: GetFieldID returned NULL\n");
-                         return;
-                 }
          }
          obj = env->GetObjectField(o, objFieldId);
-         if (obj == NULL) {
-                 printf("Error: GetObjectField returned NULL\n");
-                 return;
-         }
          env->SetObjectField(o, objFieldId, NULL);
          start_time = time(NULL);
          enterTime /= 1000;
          current_time = 0;
          while (current_time - start_time < enterTime) {
                  gref = env->NewWeakGlobalRef(obj);
--- 34,57 ----
   * Class:     nsk_share_gc_lock_jniref_JNIWeakGlobalRefLocker
   * Method:    criticalNative
   * Signature: (JJ)V
   */
  JNIEXPORT void JNICALL Java_nsk_share_gc_lock_jniref_JNIWeakGlobalRefLocker_criticalNative
!   (JNIEnv *jni_env, jobject o, jlong enterTime, jlong sleepTime) {
!         ExceptionCheckingJniEnvPtr env(jni_env);
! 
          jobject obj;
          jobject gref;
          time_t start_time, current_time;
  
          if (objFieldId == NULL) {
                  jclass klass = env->GetObjectClass(o);
                  objFieldId = env->GetFieldID(klass, "obj", "Ljava/lang/Object;");
          }
          obj = env->GetObjectField(o, objFieldId);
          env->SetObjectField(o, objFieldId, NULL);
+ 
          start_time = time(NULL);
          enterTime /= 1000;
          current_time = 0;
          while (current_time - start_time < enterTime) {
                  gref = env->NewWeakGlobalRef(obj);