diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java index fd23774a9d1..1c89ab81d34 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/OperationExecutorImpl.java @@ -84,10 +84,6 @@ public Mono execute(final AsyncReadOperation operation, final ReadPref clientSessionHelper.withClientSession(session, this) .map(clientSession -> getReadWriteBinding(getContext(subscriber), readPreference, readConcern, clientSession, session == null)) - // TODO (CSOT) - does this get called - can the above return empty? - .switchIfEmpty(Mono.fromCallable(() -> - getReadWriteBinding(getContext(subscriber), - readPreference, readConcern, session, false))) .flatMap(binding -> { if (session != null && session.hasActiveTransaction() && !binding.getReadPreference().equals(primary())) { binding.release(); @@ -122,10 +118,6 @@ public Mono execute(final AsyncWriteOperation operation, final ReadCon clientSessionHelper.withClientSession(session, this) .map(clientSession -> getReadWriteBinding(getContext(subscriber), primary(), readConcern, clientSession, session == null)) - // TODO (CSOT) - does this get called - can the above return empty? - .switchIfEmpty(Mono.fromCallable(() -> - getReadWriteBinding(getContext(subscriber), primary(), - readConcern, session, false))) .flatMap(binding -> Mono.create(sink -> operation.executeAsync(binding, (result, t) -> { try {