From 83d73be30c4e4d1015a44319003e5e0e8093508d Mon Sep 17 00:00:00 2001 From: Viacheslav Babanin Date: Fri, 6 Jun 2025 12:52:36 -0700 Subject: [PATCH] Use OperationContext with NOOP Session (#1733) JAVA-5880 (cherry picked from commit 3de5b477fa6b5edbb3072762fcc590c539615160) --- .../main/com/mongodb/internal/connection/Authenticator.java | 2 +- .../com/mongodb/internal/connection/OidcAuthenticator.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java b/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java index b1579cd1190..2889a938709 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java +++ b/driver-core/src/main/com/mongodb/internal/connection/Authenticator.java @@ -113,7 +113,7 @@ public void reauthenticateAsync(final InternalConnection connection, final Opera }).finish(callback); } - private static OperationContext operationContextWithoutSession(final OperationContext operationContext) { + static OperationContext operationContextWithoutSession(final OperationContext operationContext) { return operationContext.withSessionContext( new ReadConcernAwareNoOpSessionContext(operationContext.getSessionContext().getReadConcern())); } diff --git a/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java b/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java index 99fcee788ed..1e67626d60d 100644 --- a/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java +++ b/driver-core/src/main/com/mongodb/internal/connection/OidcAuthenticator.java @@ -253,7 +253,7 @@ static OidcCallback getGcpCallback(final MongoCredential credential) { @Override public void reauthenticate(final InternalConnection connection, final OperationContext operationContext) { assertTrue(connection.opened()); - authenticationLoop(connection, connection.getDescription(), operationContext); + authenticationLoop(connection, connection.getDescription(), operationContextWithoutSession(operationContext)); } @Override @@ -262,7 +262,7 @@ public void reauthenticateAsync(final InternalConnection connection, final SingleResultCallback callback) { beginAsync().thenRun(c -> { assertTrue(connection.opened()); - authenticationLoopAsync(connection, connection.getDescription(), operationContext, c); + authenticationLoopAsync(connection, connection.getDescription(), operationContextWithoutSession(operationContext), c); }).finish(callback); }