commit d43f160dc294655885a2c273307d34585c4ce97b
author Sebastien Hertz <shertz@google.com> Fri Apr 03 08:00:37 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 03 08:00:39 2015 +0000
tree e75dc227486dd87f49a2ca3283437b1e5b4e374b
parent ae36b4a8d05525c977af831f1b31126d84159e4f
parent 64db239fdb45fcfc41b7a85220894d3e20fabcd5

Merge "Revert "ART: Workaround for b/20019689""

runtime/transaction.cc

diff --git a/runtime/transaction.cc b/runtime/transaction.cc
index 5b8d23b..9b205c3 100644
--- a/runtime/transaction.cc
+++ b/runtime/transaction.cc
@@ -76,11 +76,7 @@
                        << " 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() {