Merge branch 'v1.6' of github.com:mongodb/mongo into v1.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