Move BerkeleyEnvironment deletion from internal method to callsite

achow101 · achow101 · commit a769461d5e37 · 2018-08-09T11:27:39.000-07:00
Instead of having the object destroy itself, having the caller
destroy it.
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -697,7 +697,6 @@ void BerkeleyEnvironment::Flush(bool fShutdown)
                 if (!fMockDb) {
                     fs::remove_all(fs::path(strPath) / "database");
                 }
-                g_dbenvs.erase(strPath);
             }
         }
     }
@@ -796,6 +795,10 @@ void BerkeleyDatabase::Flush(bool shutdown)
 {
     if (!IsDummy()) {
         env->Flush(shutdown);
-        if (shutdown) env = nullptr;
+        if (shutdown) {
+            LOCK(cs_db);
+            g_dbenvs.erase(env->Directory().string());
+            env = nullptr;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,6 @@ void BerkeleyEnvironment::Flush(bool fShutdown)`
`697`	`697`	`if (!fMockDb) {`
`698`	`698`	`fs::remove_all(fs::path(strPath) / "database");`
`699`	`699`	`}`
`700`		`- g_dbenvs.erase(strPath);`
`701`	`700`	`}`
`702`	`701`	`}`
`703`	`702`	`}`
`@@ -796,6 +795,10 @@ void BerkeleyDatabase::Flush(bool shutdown)`
`796`	`795`	`{`
`797`	`796`	`if (!IsDummy()) {`
`798`	`797`	`env->Flush(shutdown);`
`799`		`- if (shutdown) env = nullptr;`
	`798`	`+ if (shutdown) {`
	`799`	`+ LOCK(cs_db);`
	`800`	`+ g_dbenvs.erase(env->Directory().string());`
	`801`	`+ env = nullptr;`
	`802`	`+ }`
`800`	`803`	`}`
`801`	`804`	`}`