src/share/vm/runtime/safepoint.cpp

*** 361,371 ****
      assert(cur->was_visited_for_critical_count(), "missed a thread");
    }
  #endif // ASSERT
  
    // Update the count of active JNI critical regions
!   GC_locker::set_jni_lock_count(_current_jni_active_count);
  
    if (log_is_enabled(Debug, safepoint)) {
      VM_Operation *op = VMThread::vm_operation();
      log_debug(safepoint)("Entering safepoint region: %s",
                           (op != NULL) ? op->name() : "no vm operation");
--- 361,371 ----
      assert(cur->was_visited_for_critical_count(), "missed a thread");
    }
  #endif // ASSERT
  
    // Update the count of active JNI critical regions
!   GCLocker::set_jni_lock_count(_current_jni_active_count);
  
    if (log_is_enabled(Debug, safepoint)) {
      VM_Operation *op = VMThread::vm_operation();
      log_debug(safepoint)("Entering safepoint region: %s",
                           (op != NULL) ? op->name() : "no vm operation");
*** 561,571 ****
        // more than one safepoint, so only update the critical state on
        // the first one.  When it returns it will perform the unlock.
        if (!thread->do_critical_native_unlock()) {
  #ifdef ASSERT
          if (!thread->in_critical()) {
!           GC_locker::increment_debug_jni_lock_count();
          }
  #endif
          thread->enter_critical();
          // Make sure the native wrapper calls back on return to
          // perform the needed critical unlock.
--- 561,571 ----
        // more than one safepoint, so only update the critical state on
        // the first one.  When it returns it will perform the unlock.
        if (!thread->do_critical_native_unlock()) {
  #ifdef ASSERT
          if (!thread->in_critical()) {
!           GCLocker::increment_debug_jni_lock_count();
          }
  #endif
          thread->enter_critical();
          // Make sure the native wrapper calls back on return to
          // perform the needed critical unlock.