src/share/vm/runtime/mutexLocker.cpp

rev 8978 : imported patch remove_err_msg

*** 153,171 ****
    if (SafepointSynchronize::is_at_safepoint()) return;
    if (!Universe::is_fully_initialized()) return;
    // see if invoker of VM operation owns it
    VM_Operation* op = VMThread::vm_operation();
    if (op != NULL && op->calling_thread() == lock->owner()) return;
!   fatal(err_msg("must own lock %s", lock->name()));
  }
  
  // a stronger assertion than the above
  void assert_lock_strong(const Monitor * lock) {
    if (IgnoreLockingAssertions) return;
    assert(lock != NULL, "Need non-NULL lock");
    if (lock->owned_by_self()) return;
!   fatal(err_msg("must own lock %s", lock->name()));
  }
  #endif
  
  #define def(var, type, pri, vm_block, safepoint_check_allowed ) {      \
    var = new type(Mutex::pri, #var, vm_block, safepoint_check_allowed); \
--- 153,171 ----
    if (SafepointSynchronize::is_at_safepoint()) return;
    if (!Universe::is_fully_initialized()) return;
    // see if invoker of VM operation owns it
    VM_Operation* op = VMThread::vm_operation();
    if (op != NULL && op->calling_thread() == lock->owner()) return;
!   fatal("must own lock %s", lock->name());
  }
  
  // a stronger assertion than the above
  void assert_lock_strong(const Monitor * lock) {
    if (IgnoreLockingAssertions) return;
    assert(lock != NULL, "Need non-NULL lock");
    if (lock->owned_by_self()) return;
!   fatal("must own lock %s", lock->name());
  }
  #endif
  
  #define def(var, type, pri, vm_block, safepoint_check_allowed ) {      \
    var = new type(Mutex::pri, #var, vm_block, safepoint_check_allowed); \