commit a703a7280a5081dd4e6f7e0d3860748f8a29965e
author Andreas Gampe <agampe@google.com> Wed Apr 01 21:29:46 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 01 21:29:47 2015 +0000
tree f7c63a9d4752aa5a514caf83b6b5ecc847daabff
parent 475e4c2dd0a07e0f28c6f30e7dcaf4d3d177a52c
parent 328dd4457632f59e67d08d9d086670b56141a4b1

Merge "ART: Workaround for b/20019689"

runtime/transaction.cc

diff --git a/runtime/transaction.cc b/runtime/transaction.cc
index 3b708f6..186cfea 100644
--- a/runtime/transaction.cc
+++ b/runtime/transaction.cc
@@ -75,7 +75,11 @@
     CHECK(IsAborted()) << "Rethrow InternalError while transaction is not aborted";
   }
   std::string abort_msg(GetAbortMessage());
-  self->ThrowNewWrappedException("Ljava/lang/InternalError;", abort_msg.c_str());
+  // Temporary workaround for b/20019689.
+  if (self->IsExceptionPending()) {
+    self->ClearException();
+  }
+  self->ThrowNewException("Ljava/lang/InternalError;", abort_msg.c_str());
 }
 
 bool Transaction::IsAborted() {