From 9865bde5d822f56c4732214c2005dfcaa41f94cf Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Mon, 21 Dec 2015 09:58:16 -0800 Subject: Rename NullHandle to ScopedNullHandle This makes it clearer that is invalid to do things like: Handle h = ScopedNullHandle(); Bug: 26233305 Change-Id: I6d8f54eae01ec2e901cb7043afa853ea77db79fe --- runtime/gc/reference_queue_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime/gc/reference_queue_test.cc') diff --git a/runtime/gc/reference_queue_test.cc b/runtime/gc/reference_queue_test.cc index ab921d95f1..dc23afed1d 100644 --- a/runtime/gc/reference_queue_test.cc +++ b/runtime/gc/reference_queue_test.cc @@ -35,7 +35,7 @@ TEST_F(ReferenceQueueTest, EnqueueDequeue) { ASSERT_EQ(queue.GetLength(), 0U); auto ref_class = hs.NewHandle( Runtime::Current()->GetClassLinker()->FindClass(self, "Ljava/lang/ref/WeakReference;", - NullHandle())); + ScopedNullHandle())); ASSERT_TRUE(ref_class.Get() != nullptr); auto ref1(hs.NewHandle(ref_class->AllocObject(self)->AsReference())); ASSERT_TRUE(ref1.Get() != nullptr); @@ -65,11 +65,11 @@ TEST_F(ReferenceQueueTest, Dump) { queue.Dump(LOG(INFO)); auto weak_ref_class = hs.NewHandle( Runtime::Current()->GetClassLinker()->FindClass(self, "Ljava/lang/ref/WeakReference;", - NullHandle())); + ScopedNullHandle())); ASSERT_TRUE(weak_ref_class.Get() != nullptr); auto finalizer_ref_class = hs.NewHandle( Runtime::Current()->GetClassLinker()->FindClass(self, "Ljava/lang/ref/FinalizerReference;", - NullHandle())); + ScopedNullHandle())); ASSERT_TRUE(finalizer_ref_class.Get() != nullptr); auto ref1(hs.NewHandle(weak_ref_class->AllocObject(self)->AsReference())); ASSERT_TRUE(ref1.Get() != nullptr); -- cgit v1.2.3-59-g8ed1b