SERVER-4328 it is ok to not tempreleasecond when nested fix the new impl to not assert

1 files changed, 13 insertions, 7 deletions

diff --git a/src/mongo/db/db.h b/src/mongo/db/db.h
index dd7818b6428..7fa1b521634 100644
--- a/src/mongo/db/db.h
+++ b/src/mongo/db/db.h
@@ -36,7 +36,10 @@ namespace mongo {
             const Client& c = cc();
             _context = c.getContext();
             assert( Lock::isLocked() );
-            massert(10298 , "can't temprelease nested lock", !Lock::nested());
+            if( Lock::nested() ) {
+                Lock::nested();
+                massert(10298 , "can't temprelease nested lock", false);
+            }
             if ( _context ) {
                 _context->unlocked();
             }
@@ -81,12 +84,17 @@ namespace mongo {
     /**
        only does a temp release if we're not nested and have a lock
      */
-    struct dbtempreleasecond {
+    class dbtempreleasecond : boost::noncopyable {
         dbtemprelease * real;
+    public:
         dbtempreleasecond() {
             real = 0;
-            if( Lock::isLocked() )
-                real = new dbtemprelease();
+            if( Lock::isLocked() ) {
+                // if nested don't temprelease, and we don't complain either for this class
+                if( !Lock::nested() ) {
+                    real = new dbtemprelease();
+                }
+            }
         }
         ~dbtempreleasecond() {
             if ( real ) {
@@ -94,9 +102,7 @@ namespace mongo {
                 real = 0;
             }
         }
-        bool unlocked() {
-            return real != 0;
-        }
+        bool unlocked() const { return real != 0; }
     };
 
 } // namespace mongo