commit 00ae676e307c8e3c3b19852f41ad0547c4c523b8
author Sebastien Hertz <shertz@google.com> Mon Aug 05 16:37:51 2013 +0200
committer Ian Rogers <irogers@google.com> Mon Aug 12 06:33:43 2013 +0000
tree 3f7659e4b60f1a8f22346c927d3122012d5ee6bf
parent 442cd6ec36f3f451960496174bb9396ed2de0a73

Fix typo in mutex.h file.

Change-Id: I11db56161025285022ea1137fb7749751d14b347
(cherry picked from commit 702a85b33c57da99e83698129a289687cdb0be1f)

runtime/base/mutex.h

diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index b924798..21ba0d2 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -238,7 +238,7 @@
 
   // Assert the current thread has exclusive access to the ReaderWriterMutex.
   void AssertExclusiveHeld(const Thread* self) {
-    if (kDebugLocking & (gAborting == 0)) {
+    if (kDebugLocking && (gAborting == 0)) {
       CHECK(IsExclusiveHeld(self)) << *this;
     }
   }
@@ -246,7 +246,7 @@
 
   // Assert the current thread doesn't have exclusive access to the ReaderWriterMutex.
   void AssertNotExclusiveHeld(const Thread* self) {
-    if (kDebugLocking & (gAborting == 0)) {
+    if (kDebugLocking && (gAborting == 0)) {
       CHECK(!IsExclusiveHeld(self)) << *this;
     }
   }
@@ -257,7 +257,7 @@
 
   // Assert the current thread has shared access to the ReaderWriterMutex.
   void AssertSharedHeld(const Thread* self) {
-    if (kDebugLocking  & (gAborting == 0)) {
+    if (kDebugLocking && (gAborting == 0)) {
       // TODO: we can only assert this well when self != NULL.
       CHECK(IsSharedHeld(self) || self == NULL) << *this;
     }