From 5647d189c3ea5324e569d96cef67c87879d6cd05 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Fri, 7 Mar 2014 15:00:39 -0800
Subject: Fix tests to pass with VerifyObject.

A SIRT ref with a null class was causing object verification problems
in space_test.

Change-Id: I95cfc3da5e0fec0155387f75612b0a3f26f6d3c9
---
 runtime/indirect_reference_table.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runtime/indirect_reference_table.cc')

diff --git a/runtime/indirect_reference_table.cc b/runtime/indirect_reference_table.cc
index ed3fb5f..bbad884 100644
--- a/runtime/indirect_reference_table.cc
+++ b/runtime/indirect_reference_table.cc
@@ -360,7 +360,9 @@ mirror::Object* IndirectReferenceTable::Get(IndirectRef iref) const {
     return kInvalidIndirectRefObject;
   }
   mirror::Object* obj = table_[ExtractIndex(iref)];;
-  VerifyObject(obj);
+  if (obj != kClearedJniWeakGlobal) {
+    VerifyObject(obj);
+  }
   return obj;
 }
 
-- 
cgit v1.1