From 25a78e0b8e4685b2da3b978f2c77ac5234cbb8e6 Mon Sep 17 00:00:00 2001 From: Jon Meredith Date: Tue, 30 Jun 2009 00:11:41 +0800 Subject: [PATCH] Moved check_all_databases_closed inside check for G_DB_ENV != NULL, otherwise fails on LOCK_DATABASE when G_DATABASES_MUTEX is uninitialized. --- c_src/bdberl_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/c_src/bdberl_drv.c b/c_src/bdberl_drv.c index 993d438..ce37b9d 100644 --- a/c_src/bdberl_drv.c +++ b/c_src/bdberl_drv.c @@ -548,15 +548,11 @@ static void bdberl_drv_finish() } G_BDBERL_PIPE[0] = -1; - - // TODO: Add check to make sure all databases are *really* closed before - // the environment is closed. - check_all_databases_closed(); - // Cleanup and shut down the BDB environment. Note that we assume // all ports have been released and thuse all databases/txns/etc are also gone. if (G_DB_ENV != NULL) { + check_all_databases_closed(); G_DB_ENV->close(G_DB_ENV, 0); G_DB_ENV = NULL; }