Improve JniLocalReferenceManager class (#31813)

project-chip · Mar 11, 2024 · 3269968 · 3269968
1 parent 71f0c7d
commit 3269968
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/lib/support/JniTypeWrappers.h b/src/lib/support/JniTypeWrappers.h
@@ -186,13 +186,14 @@ class JniGlobalRefWrapper
 class JniLocalReferenceManager
 {
 public:
-    JniLocalReferenceManager(JNIEnv * env) : mEnv(env)
+    explicit JniLocalReferenceManager(JNIEnv * env) : mEnv(env)
     {
         if (mEnv->PushLocalFrame(JNI_LOCAL_REF_COUNT) == 0)
         {
             mlocalFramePushed = true;
         }
     }
+
     ~JniLocalReferenceManager()
     {
         if (mlocalFramePushed)
@@ -202,8 +203,12 @@ class JniLocalReferenceManager
         }
     }
 
+    // Delete copy constructor and copy assignment operator
+    JniLocalReferenceManager(const JniLocalReferenceManager &)             = delete;
+    JniLocalReferenceManager & operator=(const JniLocalReferenceManager &) = delete;
+
 private:
-    JNIEnv * mEnv          = nullptr;
+    JNIEnv * const mEnv;
     bool mlocalFramePushed = false;
 };