diff options
author | Alberto Lerner <alerner@10gen.com> | 2010-10-08 17:04:11 -0400 |
---|---|---|
committer | Alberto Lerner <alerner@10gen.com> | 2010-10-08 17:04:11 -0400 |
commit | 136024a59fcaf2044d8b95c1a77437bd1f01f908 (patch) | |
tree | 41084f28bd9733bbd890dd5f3eaee45da2a11ddd | |
parent | 2905ea2e195d0c4cd74322cb7057becbd2c51440 (diff) | |
parent | 37063ffd261dee90cc53298ac8c0f7a8b9388331 (diff) | |
download | mongo-136024a59fcaf2044d8b95c1a77437bd1f01f908.tar.gz |
Merge branch 'v1.6' of github.com:mongodb/mongo into v1.6
-rw-r--r-- | db/namespace.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/db/namespace.cpp b/db/namespace.cpp index de3f4dfd129..8a1ab6f91c4 100644 --- a/db/namespace.cpp +++ b/db/namespace.cpp @@ -564,8 +564,10 @@ namespace mongo { } void renameNamespace( const char *from, const char *to ) { - NamespaceIndex *ni = nsindex( from ); - assert( ni && ni->details( from ) && !ni->details( to ) ); + NamespaceIndex *ni = nsindex( from ); + assert( ni ); + assert( ni->details( from ) ); + assert( ! ni->details( to ) ); // Our namespace and index details will move to a different // memory location. The only references to namespace and |