From 64db239fdb45fcfc41b7a85220894d3e20fabcd5 Mon Sep 17 00:00:00 2001 From: Sebastien Hertz Date: Thu, 2 Apr 2015 09:09:04 +0000 Subject: [PATCH] Revert "ART: Workaround for b/20019689" This reverts commit 328dd4457632f59e67d08d9d086670b56141a4b1. Bug: 20019689 Change-Id: Ia1087e45d1a1817b6ff4e45f8d74b84d34f078ee --- runtime/transaction.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/runtime/transaction.cc b/runtime/transaction.cc index 5b8d23b70..9b205c3eb 100644 --- a/runtime/transaction.cc +++ b/runtime/transaction.cc @@ -76,11 +76,7 @@ void Transaction::ThrowAbortError(Thread* self, bool rethrow) { << " while transaction is not aborted"; } std::string abort_msg(GetAbortMessage()); - // Temporary workaround for b/20019689. - if (self->IsExceptionPending()) { - self->ClearException(); - } - self->ThrowNewException(Transaction::kAbortExceptionSignature, abort_msg.c_str()); + self->ThrowNewWrappedException(Transaction::kAbortExceptionSignature, abort_msg.c_str()); } bool Transaction::IsAborted() { -- 2.11.0