Skip to content

Move check for previous value of "closed" outside of lambda #1058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2022
Merged

Move check for previous value of "closed" outside of lambda #1058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions driver-sync/src/main/com/mongodb/client/gridfs/GridFSUploadStreamImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,14 @@ public void write(final byte[] b, final int off, final int len) {

@Override
public void close() {
withLock(closeLock, () -> {
if (closed) {
return;
}
boolean alreadyClosed = withLock(closeLock, () -> {
boolean prevClosed = closed;
closed = true;
return prevClosed;
});
if (alreadyClosed) {
return;
}
writeChunk();
GridFSFile gridFSFile = new GridFSFile(fileId, filename, lengthInBytes, chunkSizeBytes, new Date(),
metadata);
Expand Down
1 change: 1 addition & 0 deletions ...c/src/test/functional/com/mongodb/client/gridfs/GridFSBucketSmokeTestSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class GridFSBucketSmokeTestSpecification extends FunctionalSpecification {
def outputStream = gridFSBucket.openUploadStream('myFile')
outputStream.write(contentBytes)
outputStream.close()
outputStream.close() // check for close idempotency
fileId = outputStream.getObjectId()
}

Expand Down