SERVER-7367 Add default constructor for empty config

mongodb · Nov 6, 2012 · 43efcff · 43efcff
1 parent ea86be5
commit 43efcff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/mongo/db/repl/rs.cpp b/src/mongo/db/repl/rs.cpp
@@ -681,8 +681,11 @@ namespace mongo {
                     DBDirectClient cli;
                     BSONObj config = cli.findOne(rsConfigNs, Query()).getOwned();
 
-                    // Add local config, if it exists
-                    if (!config.isEmpty()) {
+                    // Add local config
+                    if (config.isEmpty()) {
+                        configs.push_back(ReplSetConfig());
+                    }
+                    else {
                         configs.push_back(ReplSetConfig(config, false));
                     }
                 }

diff --git a/src/mongo/db/repl/rs_config.cpp b/src/mongo/db/repl/rs_config.cpp
@@ -581,6 +581,10 @@ namespace mongo {
         uassert(13122, "bad repl set config?", expr);
     }
 
+    ReplSetConfig::ReplSetConfig() :
+        version(EMPTYCONFIG),_ok(false),_majority(-1)
+    {}
+
     ReplSetConfig::ReplSetConfig(BSONObj cfg, bool force) :
         _ok(false),_chainingAllowed(true),_majority(-1)
     {

diff --git a/src/mongo/db/repl/rs_config.h b/src/mongo/db/repl/rs_config.h
@@ -36,6 +36,7 @@ namespace mongo {
         // Protects _groups.
         static mongo::mutex groupMx;
     public:
+        ReplSetConfig();
         /**
          * This contacts the given host and tries to get a config from them.
          *