refs #6279. Deadlock issue in Gmock 1.6.0

mantidproject · Dec 11, 2012 · 2411bb6 · 2411bb6
1 parent 9d20f58
commit 2411bb6
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Code/Mantid/TestingTools/gmock-1.6.0/src/gmock-spec-builders.cc b/Code/Mantid/TestingTools/gmock-1.6.0/src/gmock-spec-builders.cc
@@ -480,7 +480,16 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked() {
              untyped_expectation->line(), ss.str());
     }
   }
-  untyped_expectations_.clear();
+
+  // Swap data with empty to safely clear it outside mutex
+  UntypedExpectations tmp_untyped_expectations;
+  tmp_untyped_expectations.swap(untyped_expectations_);
+
+  // Unlock global mutex to avoid deadlock in nested destructors
+  g_gmock_mutex.Unlock();
+  tmp_untyped_expectations.clear();
+  g_gmock_mutex.Lock();
+
   return expectations_met;
 }