summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-05-20 05:42:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-20 05:42:50 +0000
commit1a5ff7c3a6508deacd3fd6473de80c62f7316a81 (patch)
tree3db807e58cc15a482f5d17b9fda9f73bb2fe8eff
parent607fa7b07233a7233ebe21bba8f3e7c1925ae0f2 (diff)
parent46889ea4c43f1e3238851d1120c5f16a7212f4b6 (diff)
downloadandroid_art-1a5ff7c3a6508deacd3fd6473de80c62f7316a81.tar.gz
android_art-1a5ff7c3a6508deacd3fd6473de80c62f7316a81.tar.bz2
android_art-1a5ff7c3a6508deacd3fd6473de80c62f7316a81.zip
Merge "Fix DexFile.getClassNameList."
-rw-r--r--runtime/native/dalvik_system_DexFile.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index 9f9d82b919..716356e9a0 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -200,7 +200,7 @@ static jclass DexFile_defineClassNative(JNIEnv* env, jclass, jstring javaName, j
static jobjectArray DexFile_getClassNameList(JNIEnv* env, jclass, jlong cookie) {
jobjectArray result = nullptr;
const DexFile* dex_file = toDexFile(cookie, env);
- if (dex_file == nullptr) {
+ if (dex_file != nullptr) {
result = env->NewObjectArray(dex_file->NumClassDefs(), WellKnownClasses::java_lang_String,
nullptr);
if (result != nullptr) {