diff options
| author | dwight <dwight@Dwights-MacBook-2.local> | 2009-08-17 17:33:04 -0400 |
|---|---|---|
| committer | dwight <dwight@Dwights-MacBook-2.local> | 2009-08-17 17:33:04 -0400 |
| commit | bc50b778cf366128823a2cbf03fdc5b0059cbf1e (patch) | |
| tree | 8a7cf0e4e282c0635e3e99a0584f9a45adf91b6c | |
| parent | 1a700c121e2cf9080e4cbbd6f720da80915a5d40 (diff) | |
| download | mongo-bc50b778cf366128823a2cbf03fdc5b0059cbf1e.tar.gz | |
fix isMaster() broken earlier today
| -rw-r--r-- | db/replset.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/db/replset.h b/db/replset.h index 649f67b482b..8c03d690804 100644 --- a/db/replset.h +++ b/db/replset.h @@ -113,12 +113,14 @@ namespace mongo { inline bool isMaster( const char *client = 0 ) { if ( !client ) client = database->name.c_str(); - if ( replAllDead || slave ) { + + if ( replAllDead ) return strcmp( client, "local" ) == 0; - } - if ( replPair == 0 || replPair->state == ReplPair::State_Master ) - return true; + if ( replPair ) { + if( replPair->state == ReplPair::State_Master ) + return true; + } return strcmp( client, "local" ) == 0; } |