Skip to content

Commit 87ba53c

Browse files
authored
Ensure encrypted fields data exists fully (#1802)
Appears theres been a change when using mongocryptd and an empty document is returned. Removed legacy Client Encryption test from the shell runner JAVA-5959
1 parent 2aa9197 commit 87ba53c

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.evergreen/run-csfle-tests-with-mongocryptd.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ echo "Running tests with Java ${JAVA_VERSION}"
6060
${GRADLE_EXTRA_VARS} \
6161
-Dorg.mongodb.test.fle.on.demand.credential.test.failure.enabled=true \
6262
--stacktrace --info --continue \
63-
driver-legacy:test \
64-
--tests "*.Client*Encryption*" \
6563
driver-sync:test \
6664
--tests "*.Client*Encryption*" \
6765
driver-reactive-streams:test \

driver-core/src/main/com/mongodb/internal/operation/DropCollectionOperation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ public void executeAsync(final AsyncWriteBinding binding, final SingleResultCall
154154
*
155155
* @return the list of commands to run to create the collection
156156
*/
157-
private List<Supplier<BsonDocument>> getCommands(final BsonDocument encryptedFields) {
158-
if (encryptedFields == null) {
157+
private List<Supplier<BsonDocument>> getCommands(@Nullable final BsonDocument encryptedFields) {
158+
if (encryptedFields == null || encryptedFields.isEmpty()) {
159159
return singletonList(this::dropCollectionCommand);
160160
} else {
161161
return asList(

0 commit comments

Comments
 (0)