summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Stearn <mathias@10gen.com>2015-02-12 15:24:27 -0500
committerRamon Fernandez <ramon.fernandez@mongodb.com>2015-02-12 15:32:08 -0500
commit79492d9cc1885d74b31b5fe24194dbc227096d6e (patch)
tree5aa3b2c27749d3ec8b7bdadfad870be1a808d15f
parent3eeddde0149962a3e3ed3656da7f851d17028ec7 (diff)
downloadmongo-79492d9cc1885d74b31b5fe24194dbc227096d6e.tar.gz
SERVER-17271 Fix segfault in WiredTigerKVEngine destructor
Only happens in unittests (cherry picked from commit 6ca5a81e340f96502bc5f530a8a6fa0d44fea052)
-rw-r--r--src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
index 8bb18967ede..ffdfda48d97 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
@@ -187,8 +187,6 @@ namespace mongo {
cleanShutdown();
}
- _sizeStorer.reset( NULL );
-
_sessionCache.reset( NULL );
}
@@ -196,7 +194,8 @@ namespace mongo {
log() << "WiredTigerKVEngine shutting down";
syncSizeInfo(true);
if (_conn) {
- // this must be the last thing we do before _conn->close();
+ // these must be the last things we do before _conn->close();
+ _sizeStorer.reset( NULL );
_sessionCache->shuttingDown();
#if !__has_feature(address_sanitizer)