commit 8a74117cac720239a69e60e734c7044b433fad47
author Hiroshi Yamauchi <yamauchi@google.com> Mon Sep 08 13:22:56 2014 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Tue Sep 09 14:19:23 2014 -0700
tree 88663982b24ac419886c432b22aebb1387c0039a
parent 9b2b927f573264c2f0d66b24ceeb361857a41ab3

Address read barrier issue with cl/106467

And tidy/add a check.

Bug: 12687968
Change-Id: If63dc0d9d0a0ce5f2eeb81734ff8f4307865f67d

runtime/runtime-inl.h

diff --git a/runtime/runtime-inl.h b/runtime/runtime-inl.h
index 8b632b2..fe05073 100644
--- a/runtime/runtime-inl.h
+++ b/runtime/runtime-inl.h
@@ -29,9 +29,7 @@
 
 inline mirror::Object* Runtime::GetClearedJniWeakGlobal() {
   mirror::Object* obj = sentinel_.Read();
-  if (obj == nullptr) {
-    LOG(ERROR) << "Failed to return cleared JNI weak global sentinel";
-  }
+  DCHECK(obj != nullptr);
   return obj;
 }