From c252c3eacd83a0c110dd065690a7f652be35b0e7 Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Sun, 16 Oct 2011 23:21:02 -0700
Subject: Clarify cause of 071 failure with an UNIMPLEMENTED

Change-Id: I6b76a53a44bb2c26fc226ef32628a63944db3dbe
---
 src/dalvik_system_DexFile.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/dalvik_system_DexFile.cc')

diff --git a/src/dalvik_system_DexFile.cc b/src/dalvik_system_DexFile.cc
index 9b29d25..bb486e2 100644
--- a/src/dalvik_system_DexFile.cc
+++ b/src/dalvik_system_DexFile.cc
@@ -36,7 +36,7 @@ namespace {
 // passed a null jstring. The correct idiom is:
 //
 //   NullableScopedUtfChars name(env, javaName);
-//   if (env->ExceptionOccurred()) {
+//   if (env->ExceptionCheck()) {
 //       return NULL;
 //   }
 //   // ... use name.c_str()
@@ -85,9 +85,13 @@ static jint DexFile_openDexFile(JNIEnv* env, jclass, jstring javaSourceName, jst
     return 0;
   }
   NullableScopedUtfChars outputName(env, javaOutputName);
-  if (env->ExceptionOccurred()) {
+  if (env->ExceptionCheck()) {
     return 0;
   }
+  if (outputName.c_str() != NULL) {
+    // TODO: extract dex and run dex2oat like oatopt
+    UNIMPLEMENTED(FATAL) << sourceName.c_str() << " " << outputName.c_str();
+  }
   const DexFile* dex_file = DexFile::Open(sourceName.c_str(), "");
   if (dex_file == NULL) {
     jniThrowExceptionFmt(env, "java/io/IOException", "unable to open DEX file: %s",
-- 
cgit v1.1