commit 725de295024c9e5adf5e316f498c39d48158e19d
author Ian Rogers <irogers@google.com> Tue Nov 27 13:06:28 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 27 13:06:29 2012 -0800
tree 68470f11403def33eef2af5b000ac8b6f5707649
parent ce945c48173a7cc39fe41f04889def830f8b28f4
parent 9e419ca03c674b913135b87bcf2291a12708260b

Merge "Disable another CHECK when gAborting" into dalvik-dev

src/mutex.cc

diff --git a/src/mutex.cc b/src/mutex.cc
index 1cdbc4d..93b91e6 100644
--- a/src/mutex.cc
+++ b/src/mutex.cc
@@ -352,7 +352,7 @@
   bool result = (GetExclusiveOwnerTid() == SafeGetTid(self));
   if (kDebugLocking) {
     // Sanity debug check that if we think it is locked we have it in our held mutexes.
-    if (result && self != NULL && level_ != kMonitorLock) {
+    if (result && self != NULL && level_ != kMonitorLock && !gAborting) {
       CHECK_EQ(self->GetHeldMutex(level_), this);
     }
   }