am 8a2903f5: am b8a54826: Don\'t use static jclass unless we hold a reference.

Merge commit '8a2903f5d11d14c8cb827d22a0a877a6e3507906'

* commit '8a2903f5d11d14c8cb827d22a0a877a6e3507906':
  Don't use static jclass unless we hold a reference.

1 files changed, 9 insertions, 14 deletions

diff --git a/WebKit/android/jni/MIMETypeRegistry.cpp b/WebKit/android/jni/MIMETypeRegistry.cpp
index 4e9ae68..b85b4a5 100644
--- a/WebKit/android/jni/MIMETypeRegistry.cpp
+++ b/WebKit/android/jni/MIMETypeRegistry.cpp
@@ -37,25 +37,20 @@
 
 namespace WebCore {
 
-static jmethodID gMimeTypeFromExtension;
-static jclass    gMimeClass;
-
 String MIMETypeRegistry::getMIMETypeForExtension(const String& ext)
 {
     JNIEnv* env = JSC::Bindings::getJNIEnv();
-    if (!gMimeTypeFromExtension) {
-        gMimeClass = env->FindClass("android/webkit/MimeTypeMap");
-        LOG_ASSERT(gMimeClass, "Could not find class MimeTypeMap");
-        gMimeTypeFromExtension = env->GetStaticMethodID(gMimeClass,
-                "mimeTypeFromExtension",
-                "(Ljava/lang/String;)Ljava/lang/String;");
-        LOG_ASSERT(gMimeTypeFromExtension,
-                "Could not find method mimeTypeFromExtension");
-    }
+    jclass mimeClass = env->FindClass("android/webkit/MimeTypeMap");
+    LOG_ASSERT(mimeClass, "Could not find class MimeTypeMap");
+    jmethodID mimeTypeFromExtension = env->GetStaticMethodID(mimeClass,
+            "mimeTypeFromExtension",
+            "(Ljava/lang/String;)Ljava/lang/String;");
+    LOG_ASSERT(mimeTypeFromExtension,
+            "Could not find method mimeTypeFromExtension");
     jstring extString =
             env->NewString((const jchar*) ext.characters(), ext.length());
-    jobject mimeType = env->CallStaticObjectMethod(gMimeClass,
-            gMimeTypeFromExtension, extString);
+    jobject mimeType = env->CallStaticObjectMethod(mimeClass,
+            mimeTypeFromExtension, extString);
     String result = android::to_string(env, (jstring) mimeType);
     env->DeleteLocalRef(extString);
     env->DeleteLocalRef(mimeType);