summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron <aaron@10gen.com>2011-08-23 13:03:56 -0700
committerAaron <aaron@10gen.com>2011-08-23 13:03:56 -0700
commit0fa2156404a615b188a1ebb05998dad2c13a0721 (patch)
tree650735c8fb0398b32a245fdd53f93ea9b6fb223d
parentfebe8962d0ef76dcbf55a82bd91701a3cb21f965 (diff)
downloadmongo-0fa2156404a615b188a1ebb05998dad2c13a0721.tar.gz
Revert "try to fix jstests/dur/closeall.js"
This reverts commit 3e1729e2b6c3668712c3f0197e09a55386e008a6.
-rw-r--r--db/repl.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/db/repl.cpp b/db/repl.cpp
index 9573d1e8107..3d08f2324c0 100644
--- a/db/repl.cpp
+++ b/db/repl.cpp
@@ -535,19 +535,11 @@ namespace mongo {
// Database is already present.
return true;
}
-
- {
- const BSONElement e = op.getField( "ts" );
- if ( e.eoo() ) {
- warning() << "why is ts null: " << op << endl;
- }
- else if ( ___databaseIgnorer.ignoreAt( db, e._opTime() ) ) {
- // Database is ignored due to a previous indication that it is
- // missing from master after optime "ts".
- return false;
- }
+ if ( ___databaseIgnorer.ignoreAt( db, op.getField( "ts" ).date() ) ) {
+ // Database is ignored due to a previous indication that it is
+ // missing from master after optime "ts".
+ return false;
}
-
if ( Database::duplicateUncasedName( db, dbpath ).empty() ) {
// No duplicate database names are present.
return true;