From aa5fe3d206f72c4e7ff6632e169de2d0df6672e2 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Mon, 17 Jun 2013 12:46:22 +0100 Subject: Avoid unnecessary FindClass("java/lang/String"). Use previously retrieved global reference instead. Check for NULL after creating the global reference. Change-Id: I21670d2ef0f63ddb5801dd21e7e56359e5519479 --- core/jni/android_util_AssetManager.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index d422951039e8..89dc70d6de90 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -293,17 +293,10 @@ static jobjectArray android_content_AssetManager_list(JNIEnv* env, jobject clazz return NULL; } - jclass cls = env->FindClass("java/lang/String"); - LOG_FATAL_IF(cls == NULL, "No string class?!?"); - if (cls == NULL) { - delete dir; - return NULL; - } - size_t N = dir->getFileCount(); jobjectArray array = env->NewObjectArray(dir->getFileCount(), - cls, NULL); + g_stringClass, NULL); if (array == NULL) { delete dir; return NULL; @@ -1455,19 +1448,13 @@ static jobjectArray android_content_AssetManager_getArrayStringResource(JNIEnv* } const ResTable& res(am->getResources()); - jclass cls = env->FindClass("java/lang/String"); - LOG_FATAL_IF(cls == NULL, "No string class?!?"); - if (cls == NULL) { - return NULL; - } - const ResTable::bag_entry* startOfBag; const ssize_t N = res.lockBag(arrayResId, &startOfBag); if (N < 0) { return NULL; } - jobjectArray array = env->NewObjectArray(N, cls, NULL); + jobjectArray array = env->NewObjectArray(N, g_stringClass, NULL); if (env->ExceptionCheck()) { res.unlockBag(startOfBag); return NULL; @@ -1764,6 +1751,7 @@ int register_android_content_AssetManager(JNIEnv* env) jclass stringClass = env->FindClass("java/lang/String"); LOG_FATAL_IF(stringClass == NULL, "Unable to find class java/lang/String"); g_stringClass = (jclass)env->NewGlobalRef(stringClass); + LOG_FATAL_IF(g_stringClass == NULL, "Unable to create global reference for class java/lang/String"); return AndroidRuntime::registerNativeMethods(env, "android/content/res/AssetManager", gAssetManagerMethods, NELEM(gAssetManagerMethods)); -- cgit v1.2.3-59-g8ed1b