commit 2ec3f71bee23d97ec35c80222c1d073b87b42a0f
author Jeff Hao <jeffhao@google.com> Wed Oct 30 15:13:17 2013 -0700
committer Jeff Hao <jeffhao@google.com> Wed Oct 30 16:31:11 2013 -0700
tree 842833bb0a9c482a20346ef415942d01a5b7b3bf
parent a52454455048d04d12e4da637a103412a55e579b

Fix openDexFileNative to throw pending exception when it fails.

Bug: 11391006
Change-Id: I2331d73a2ab8f70d46b1afb2649550c296e7393a

runtime/native/dalvik_system_DexFile.cc

diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index 55a56d6..ab5eab3 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -113,8 +113,7 @@
                                                          outputName.c_str(), &error_msg);
   }
   if (dex_file == nullptr) {
-    ScopedObjectAccess soa(env);
-    ThrowIOException("%s", error_msg.c_str());
+    CHECK_EQ(env->ExceptionCheck(), JNI_TRUE);
     return 0;
   }
   return static_cast<jint>(reinterpret_cast<uintptr_t>(dex_file));