From 3743ef42bd37d3995df7c9f4961b6e404d13a132 Mon Sep 17 00:00:00 2001
From: fanchao <git@fanchao.dev>
Date: Tue, 28 May 2024 14:51:25 +1000
Subject: [PATCH] Catch another merge function

---
 libsession-util/src/main/cpp/config_base.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/libsession-util/src/main/cpp/config_base.cpp b/libsession-util/src/main/cpp/config_base.cpp
index f0596bd93b..50e474cd33 100644
--- a/libsession-util/src/main/cpp/config_base.cpp
+++ b/libsession-util/src/main/cpp/config_base.cpp
@@ -105,12 +105,15 @@ Java_network_loki_messenger_libsession_1util_ConfigBase_merge___3Lkotlin_Pair_2(
 JNIEXPORT jobject JNICALL
 Java_network_loki_messenger_libsession_1util_ConfigBase_merge__Lkotlin_Pair_2(JNIEnv *env, jobject thiz,
                                                                    jobject to_merge) {
-    std::lock_guard lock{util::util_mutex_};
-    auto conf = ptrToConfigBase(env, thiz);
-    std::vector<std::pair<std::string, session::ustring>> configs = {extractHashAndData(env, to_merge)};
-    auto returned = conf->merge(configs);
-    auto string_stack = util::build_string_stack(env, returned);
-    return string_stack;
+    return jni_utils::run_catching_cxx_exception_or_throws<jobject>(env, [=] {
+        std::lock_guard lock{util::util_mutex_};
+        auto conf = ptrToConfigBase(env, thiz);
+        std::vector<std::pair<std::string, session::ustring>> configs = {
+                extractHashAndData(env, to_merge)};
+        auto returned = conf->merge(configs);
+        auto string_stack = util::build_string_stack(env, returned);
+        return string_stack;
+    }
 }
 
 #pragma clang diagnostic pop