Skip to content

Commit 137db61

Browse files
committed
sq: impl: check if session is used
1 parent 7f61880 commit 137db61

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/libmongoc/src/mongoc/mongoc-bulkwrite.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -1616,8 +1616,9 @@ mongoc_bulkwrite_execute (mongoc_bulkwrite_t *self, const mongoc_bulkwriteopts_t
16161616
BSON_ASSERT (bson_in_range_int32_t_unsigned (serverid));
16171617
int32_t serverid_i32 = (int32_t) serverid;
16181618
BSON_ASSERT (bson_append_int32 (&cursor_opts, "serverId", 8, serverid_i32));
1619-
// Use same session.
1620-
if (!mongoc_client_session_append (parts.assembled.session, &cursor_opts, &error)) {
1619+
// Use same session if one was applied.
1620+
if (parts.assembled.session &&
1621+
!mongoc_client_session_append (parts.assembled.session, &cursor_opts, &error)) {
16211622
_bulkwriteexception_set_error (ret.exc, &error);
16221623
_bulkwriteexception_set_error_reply (ret.exc, &cmd_reply);
16231624
goto batch_fail;

src/libmongoc/tests/test-mongoc-bulkwrite.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ test_bulkwrite_install (TestSuite *suite)
497497
test_bulkwrite_session_with_unacknowledged,
498498
NULL /* dtor */,
499499
NULL /* ctx */,
500-
test_framework_skip_if_max_wire_version_less_than_25 // require server 8.0
501-
);
500+
test_framework_skip_if_max_wire_version_less_than_25, // require server 8.0
501+
test_framework_skip_if_no_sessions);
502502

503503
TestSuite_AddFull (suite,
504504
"/bulkwrite/double_execute",

0 commit comments

Comments
 (0)