Do objcheck for single inserts outside of writelock. SERVER-3724

Fix for bulk inserts after 2.0

1 files changed, 7 insertions, 6 deletions

diff --git a/db/instance.cpp b/db/instance.cpp
index 971cd2e7b38..565b8cb39f9 100644
--- a/db/instance.cpp
+++ b/db/instance.cpp
@@ -604,7 +604,7 @@ namespace mongo {
             }
             if( !d.moreJSObjs() )
                 break;
-            js = d.nextJsObj();
+            js = d.nextJsObj(); // TODO: refactor to do objcheck outside of writelock
         }
     }
 
@@ -613,6 +613,12 @@ namespace mongo {
         const char *ns = d.getns();
         op.debug().ns = ns;
 
+        if( !d.moreJSObjs() ) {
+            // strange.  should we complain?
+            return;
+        }
+        BSONObj js = d.nextJsObj();
+
         writelock lk(ns);
 
         // writelock is used to synchronize stepdowns w/ writes
@@ -623,11 +629,6 @@ namespace mongo {
 
         Client::Context ctx(ns);
 
-        if( !d.moreJSObjs() ) { 
-            // strange.  should we complain?
-            return;
-        }
-        BSONObj js = d.nextJsObj();
         if( d.moreJSObjs() ) { 
             insertMulti(d, ns, js);
             return;