Skip to content

Commit 0a54663

Browse files
committed
Fixed #7371: Various errors (fatal lock manager error, pthread_mutex_destroy failed) caused by races when opening/closing database
(cherry picked from commit aabae5c)
1 parent bba2051 commit 0a54663

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/jrd/Database.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ namespace Jrd
465465

466466
void Database::initGlobalObjects()
467467
{
468-
dbb_gblobj_holder =
469-
GlobalObjectHolder::init(getUniqueFileId(), dbb_filename, dbb_config);
468+
dbb_gblobj_holder.assignRefNoIncr(GlobalObjectHolder::init(getUniqueFileId(),
469+
dbb_filename, dbb_config));
470470
}
471471

472472
// Database::Linger class implementation
@@ -529,6 +529,7 @@ namespace Jrd
529529
g_hashTable->add(entry);
530530
}
531531

532+
entry->holder->addRef();
532533
return entry->holder;
533534
}
534535

0 commit comments

Comments
 (0)