commit 02c9d40cb30ce88444b7852114b47b0805517fd8
author Nicolas Geoffray <ngeoffray@google.com> Wed Jul 02 15:28:16 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 01 17:57:26 2014 +0000
tree af273981d191d98d6c933555166939ac399d9c6d
parent bcf40221d747c05be7cb78d92a20caff240291d5
parent 6354bb830cc9ccec61c6fd47580842a1b4673cd5

Merge "Fix art script for 'clean' environments."

runtime/jni_internal.cc

diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index 083f179..0624281 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -684,6 +684,11 @@
   static void ExceptionDescribe(JNIEnv* env) {
     ScopedObjectAccess soa(env);
 
+    // If we have no exception to describe, pass through.
+    if (!soa.Self()->GetException(nullptr)) {
+      return;
+    }
+
     StackHandleScope<3> hs(soa.Self());
     // TODO: Use nullptr instead of null handles?
     auto old_throw_this_object(hs.NewHandle<mirror::Object>(nullptr));

runtime/jni_internal_test.cc

diff --git a/runtime/jni_internal_test.cc b/runtime/jni_internal_test.cc
index d255ec8..d50e094 100644
--- a/runtime/jni_internal_test.cc
+++ b/runtime/jni_internal_test.cc
@@ -1472,6 +1472,12 @@
   env_->DeleteWeakGlobalRef(o2);
 }
 
+TEST_F(JniInternalTest, ExceptionDescribe) {
+  // This checks how ExceptionDescribe handles call without exception.
+  env_->ExceptionClear();
+  env_->ExceptionDescribe();
+}
+
 TEST_F(JniInternalTest, Throw) {
   EXPECT_EQ(JNI_ERR, env_->Throw(nullptr));