Cursor::supportYields SERVER-1453

1 files changed, 11 insertions, 4 deletions

diff --git a/db/clientcursor.h b/db/clientcursor.h
index 46f3a2eb70b..188c10ea51a 100644
--- a/db/clientcursor.h
+++ b/db/clientcursor.h
@@ -200,9 +200,11 @@ namespace mongo {
 
         struct YieldLock : boost::noncopyable {
             explicit YieldLock( ptr<ClientCursor> cc )
-                : _cc( cc ) , _id( cc->cursorid ) , _doingDeletes( cc->_doingDeletes ) {
-                cc->updateLocation();
-                _unlock.reset(new dbtempreleasecond());
+                : _cc( cc ) , _id( cc->cursorid ) , _doingDeletes( cc->_doingDeletes ), _canYield(cc->c->supportYields()) {
+                if ( _canYield ){
+                    cc->updateLocation();
+                    _unlock.reset(new dbtempreleasecond());
+                }
             }
             ~YieldLock(){
                 if ( _unlock ){
@@ -212,6 +214,9 @@ namespace mongo {
             }
 
             bool stillOk(){
+                if ( ! _canYield )
+                    return true;
+
                 relock();
                 
                 if ( ClientCursor::find( _id , false ) == 0 ){
@@ -224,13 +229,15 @@ namespace mongo {
             }
 
             void relock(){
-                _unlock.reset();
+                if ( _canYield )
+                    _unlock.reset();
             }
             
         private:
             ClientCursor * _cc;
             CursorId _id;
             bool _doingDeletes;
+            bool _canYield;
             
             scoped_ptr<dbtempreleasecond> _unlock;