highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-24 07:21:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move BerkeleyEnvironment deletion from internal method to callsite

Browse Source 
Instead of having the object destroy itself, having the caller
destroy it.
This commit is contained in:
Andrew Chow
2018-07-13 19:15:30 -07:00
parent f66e1c793e
commit a769461d5e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/wallet/db.cpp
View File

@@ -697,7 +697,6 @@ void BerkeleyEnvironment::Flush(bool fShutdown)
if (!fMockDb) { if (!fMockDb) {
fs::remove_all(fs::path(strPath) / "database"); fs::remove_all(fs::path(strPath) / "database");
} }
g_dbenvs.erase(strPath);
} }
} }
} }
@@ -796,6 +795,10 @@ void BerkeleyDatabase::Flush(bool shutdown)
{ {
if (!IsDummy()) { if (!IsDummy()) {
env->Flush(shutdown); env->Flush(shutdown);
if (shutdown) env = nullptr; if (shutdown) {
LOCK(cs_db);
g_dbenvs.erase(env->Directory().string());
env = nullptr;
}
} }
} }