Fix an issue with unnecessary capture in lambda expressions

Closes https://github.com/facebook/rocksdb/issues/3900
2018-05-25 16:27:17 +02:00
1 changed files with 8 additions and 0 deletions
--- a/java/rocksjni/transaction_db.cc
+++ b/java/rocksjni/transaction_db.cc
@ -307,6 +307,7 @@ jobject Java_org_rocksdb_TransactionDB_getLockStatusData(JNIEnv* env,
    return nullptr;
  }

+<<<<<<< Updated upstream
  const rocksdb::HashMapJni::FnMapKV<const int32_t, const rocksdb::KeyLockInfo>
      fn_map_kv =
          [env, txn_db, &lock_status_data](
@ -315,6 +316,13 @@ jobject Java_org_rocksdb_TransactionDB_getLockStatusData(JNIEnv* env,
            const jobject jlong_column_family_id =
                rocksdb::LongJni::valueOf(env, pair.first);
            if (jlong_column_family_id == nullptr) {
+=======
+  const rocksdb::HashMapJni::FnMapKV<const int32_t, const rocksdb::KeyLockInfo> fn_map_kv =
+      [env](const std::pair<const int32_t, const rocksdb::KeyLockInfo>& pair) {
+          const jobject jlong_column_family_id =
+              rocksdb::LongJni::valueOf(env, pair.first);
+          if (jlong_column_family_id == nullptr) {
+>>>>>>> Stashed changes
              // an error occurred
              return std::unique_ptr<std::pair<jobject, jobject>>(nullptr);
            }