fix: Delay ctor initialization for WithJNIScope

margelo · Mar 12, 2024 · 24c4225 · 24c4225
1 parent 3b5a958
commit 24c4225
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/package/android/src/main/cpp/WithJNIScope.h b/package/android/src/main/cpp/WithJNIScope.h
@@ -11,9 +11,13 @@ namespace facebook {
 namespace jni {
 
   template <typename T> T WithJNIScope(std::function<T()>&& lambda) {
-    T result;
-    jni::ThreadScope::WithClassLoader([&result, lambda = std::move(lambda)]() { result = lambda(); });
-    return std::move(result);
+    // std::optional delays default constructor
+    std::optional<T> result;
+    jni::ThreadScope::WithClassLoader([&result, lambda = std::move(lambda)]() {
+      // update the optional value
+      result.emplace(lambda());
+    });
+    return std::move(result.value());
   }
 
 } // namespace jni