From fff65f39199f1628150f2fbfba974631e0561141 Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep.foundation>
Date: Thu, 25 Oct 2018 14:41:43 +0200
Subject: [PATCH] ...

---
 src/org_pEp_jniadapter_AbstractEngine.cc | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/org_pEp_jniadapter_AbstractEngine.cc b/src/org_pEp_jniadapter_AbstractEngine.cc
index 7546cbc..04b4309 100644
--- a/src/org_pEp_jniadapter_AbstractEngine.cc
+++ b/src/org_pEp_jniadapter_AbstractEngine.cc
@@ -59,23 +59,16 @@ namespace pEp {
             return thread_env;
         }
 
-        jclass clazz()
-        {
-            if (!_clazz)
-                _clazz = env()->GetObjectClass(obj);
-            return _clazz;
-        }
-
         void startup_sync()
         {
             needsFastPollMethodID = env()->GetMethodID(
-                clazz(),
+                _clazz,
                 "needsFastPollCallFromC",
                 "(Z)I");
             assert(needsFastPollMethodID);
 
             notifyHandShakeMethodID = env()->GetMethodID(
-                clazz(),
+                _clazz,
                 "notifyHandshakeCallFromC",
                 "(Lorg/pEp/jniadapter/_Identity;Lorg/pEp/jniadapter/_Identity;Lorg/pEp/jniadapter/SyncHandshakeSignal;)I");
             assert(notifyHandShakeMethodID);
@@ -150,6 +143,7 @@ extern "C" {
     {
         thread_env = env;
         obj = me;
+        _clazz = env->GetObjectClass(obj);
 
         assert(o == nullptr);
         o = new JNISync();
@@ -186,6 +180,7 @@ extern "C" {
         )
     {
         shutdown();
+        env->DeleteLocalRef(_clazz);
         session(pEp::Adapter::release);
         delete o;
     }