Issue 1848 - Clean up local reference handling

jni/JniFilterChangeCallback.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 13 matching lines @@
     return JniPtrToLong(new JniFilterChangeCallback(env, callbackObject));
   }
   CATCH_THROW_AND_RETURN(env, 0)
 }
 
 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
 {
   delete JniLongToTypePtr<JniFilterChangeCallback>(ptr);
 }
 
-JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env, jobject callbackObject)
-  : JniCallbackBase(env, callbackObject), jsValueClass(new JniGlobalReference<jclass>(env, env->FindClass(PKG("JsValue"))))
+JniFilterChangeCallback::JniFilterChangeCallback(JNIEnv* env,
+    jobject callbackObject)
+    : JniCallbackBase(env, callbackObject), jsValueClass(
+        new JniGlobalReference<jclass>(env, env->FindClass(PKG("JsValue"))))
 {
 }
 
-void JniFilterChangeCallback::Callback(const std::string& arg, const AdblockPlus::JsValuePtr jsValue)
+void JniFilterChangeCallback::Callback(const std::string& arg,
+    const AdblockPlus::JsValuePtr jsValue)
 {
   JNIEnvAcquire env(GetJavaVM());
 
-  jclass clazz = env->GetObjectClass(GetCallbackObject());
-  jmethodID method = env->GetMethodID(clazz, "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V");
+  jmethodID method = env->GetMethodID(
+      *JniLocalReference<jclass>(*env,
+          env->GetObjectClass(GetCallbackObject())),
+      "filterChangeCallback", "(Ljava/lang/String;" TYP("JsValue") ")V");
 
   if (method)
   {
-    jstring jArg = env->NewStringUTF(arg.c_str());
-    jobject jJsValue = NewJniJsValue(*env, jsValue, jsValueClass->Get());
-    env->CallVoidMethod(GetCallbackObject(), method, jArg, jJsValue);
+    JniLocalReference<jstring> jArg(*env, env->NewStringUTF(arg.c_str()));
+    JniLocalReference<jobject> jJsValue(*env,
+        NewJniJsValue(*env, jsValue, jsValueClass->Get()));
+    env->CallVoidMethod(GetCallbackObject(), method, *jArg, *jJsValue);
   }
 
   CheckAndLogJavaException(*env);
 }
 
 static JNINativeMethod methods[] =
 {
   { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
   { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
 };
 
 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_FilterChangeCallback_registerNatives(JNIEnv *env, jclass clazz)
 {
   env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
 }