commit a309d76d4c9f4e5564b09708004bf4b2e3401bb3
author Serguei Katkov <serguei.i.katkov@intel.com> Mon May 26 11:23:39 2014 +0700
committer Serguei Katkov <serguei.i.katkov@intel.com> Mon Jun 02 10:41:55 2014 +0700
tree 64390ebfb947779a72bf1c3cb950778d1c90b9bc
parent e4283be97047a26d3476acd3863dcc386498be17

Fix GC race condition in visit roots

While GC visits roots other code can change the set pending exception
due to lack of synchronization.

Change-Id: If387944ac933a66fe176df066c3a0ea52131cad4
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>

runtime/jni_internal.cc

diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index f1284db..9ca3c85 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -669,7 +669,8 @@
   }
 
   static void ExceptionClear(JNIEnv* env) {
-    static_cast<JNIEnvExt*>(env)->self->ClearException();
+    ScopedObjectAccess soa(env);
+    soa.Self()->ClearException();
   }
 
   static void ExceptionDescribe(JNIEnv* env) {