SERVER-13635: change ownership of DatabaseCatalogEntry, now StorageEngine owns

3 files changed, 7 insertions, 3 deletions

diff --git a/src/mongo/db/catalog/database.cpp b/src/mongo/db/catalog/database.cpp
index f3c8179b9e7..fa0b78ad859 100644
--- a/src/mongo/db/catalog/database.cpp
+++ b/src/mongo/db/catalog/database.cpp
@@ -524,7 +524,7 @@ namespace mongo {
     }
 
     const DatabaseCatalogEntry* Database::getDatabaseCatalogEntry() const {
-        return _dbEntry.get();
+        return _dbEntry;
     }
 
     void dropAllDatabasesExceptLocal(OperationContext* txn) {
diff --git a/src/mongo/db/catalog/database.h b/src/mongo/db/catalog/database.h
index 2b080f063de..40c6903ea5c 100644
--- a/src/mongo/db/catalog/database.h
+++ b/src/mongo/db/catalog/database.h
@@ -59,7 +59,7 @@ namespace mongo {
         // you probably need to be in dbHolderMutex when constructing this
         Database(OperationContext* txn,
                  const StringData& name,
-                 DatabaseCatalogEntry* dbEntry );
+                 DatabaseCatalogEntry* dbEntry ); // not owner here
 
         // must call close first
         ~Database();
@@ -144,7 +144,7 @@ namespace mongo {
 
         const std::string _name; // "alleyinsider"
 
-        boost::scoped_ptr<DatabaseCatalogEntry> _dbEntry;
+        DatabaseCatalogEntry* _dbEntry; // not owned here
 
         const std::string _profileName; // "alleyinsider.system.profile"
         const std::string _indexesName; // "alleyinsider.system.indexes"
diff --git a/src/mongo/db/catalog/database_holder.cpp b/src/mongo/db/catalog/database_holder.cpp
index 8b494631d67..6d129153add 100644
--- a/src/mongo/db/catalog/database_holder.cpp
+++ b/src/mongo/db/catalog/database_holder.cpp
@@ -135,6 +135,8 @@ namespace mongo {
         it->second->close( txn );
         delete it->second;
         _dbs.erase( db );
+
+        getGlobalEnvironment()->getGlobalStorageEngine()->closeDatabase( txn, db.toString() );
     }
 
     bool DatabaseHolder::closeAll(OperationContext* txn,
@@ -173,6 +175,8 @@ namespace mongo {
 
             _dbs.erase( name );
 
+            getGlobalEnvironment()->getGlobalStorageEngine()->closeDatabase( txn, name );
+
             bb.append( name );
         }