commit 2b40dd35c65ad644d448611750f5b577e97594a1
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 06 21:04:12 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 06 21:04:12 2018 +0000
tree 80887a473fde5d60c0b835969dc688c4468f690c
parent 2607d6c47114a18ccf4a532b20e1099d1dd8fcca
parent 3362d224c7f8db721d9fa60f8002cb221638a224

Merge "ART: Run ExceptionDescribe on error"

runtime/jni/java_vm_ext.cc

diff --git a/runtime/jni/java_vm_ext.cc b/runtime/jni/java_vm_ext.cc
index 8fe68bd..44679a5 100644
--- a/runtime/jni/java_vm_ext.cc
+++ b/runtime/jni/java_vm_ext.cc
@@ -912,7 +912,11 @@
               return utf.c_str();
             }
           }
-          env->ExceptionClear();
+          if (env->ExceptionCheck()) {
+            // We can't do much better logging, really. So leave it with a Describe.
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+          }
           return "(Error calling toString)";
         }
         return "null";