0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 01:21:03 +01:00

Merge branch 'master' of git@github.com:mongodb/mongo

This commit is contained in:
Dwight 2010-04-22 11:58:41 -04:00
commit 975c730efd

View File

@ -94,11 +94,15 @@ namespace mongo {
log(4) << "inserted new model " << getNS() << " " << o << endl;
}
else {
BSONElement id = _id["_id"];
b.append( id );
if ( myId.eoo() ){
myId = _id["_id"];
b.append( myId );
}
assert( ! myId.eoo() );
BSONObjBuilder qb;
qb.append( id );
qb.append( myId );
BSONObj q = qb.obj();
BSONObj o = b.obj();