diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-15 14:30:15 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-15 14:30:24 -0500 |
| commit | 8d0923109deb1d6c92c5f56fe660b2594b67297d (patch) | |
| tree | 3071e823f9d19d4fd08ca969ea4fc6be01ba37b2 /src/db.cpp | |
| parent | 709c1b267fcf4992ede95e7aff3ed333c068dfa5 (diff) | |
Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Diffstat (limited to 'src/db.cpp')
| -rw-r--r-- | src/db.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/db.cpp b/src/db.cpp index d769cae71f..643ed1f7a7 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -34,7 +34,14 @@ static void EnvShutdown(bool fRemoveLogFiles) return; fDbEnvInit = false; - dbenv.close(0); + try + { + dbenv.close(0); + } + catch (const DbException& e) + { + printf("EnvShutdown exception: %s (%d)\n", e.what(), e.get_errno()); + } DbEnv(0).remove(GetDataDir().c_str(), 0); if (fRemoveLogFiles) @@ -229,7 +236,10 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) CDataStream ssValue; int ret = db.ReadAtCursor(pcursor, ssKey, ssValue, DB_NEXT); if (ret == DB_NOTFOUND) + { + pcursor->close(); break; + } else if (ret != 0) { pcursor->close(); @@ -253,14 +263,11 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip) } if (fSuccess) { - Db* pdb = mapDb[strFile]; - if (pdb->close(0)) - fSuccess = false; + db.Close(); + CloseDb(strFile); if (pdbCopy->close(0)) fSuccess = false; - delete pdb; delete pdbCopy; - mapDb[strFile] = NULL; } if (fSuccess) { |