Skip to content

fallback for truncated ListObjects V1 responses without NextMarker #1584

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

Draft
387809109 wants to merge 1 commit into
base: maint-5.x
Choose a base branch
from
+6 −0
Draft

fallback for truncated ListObjects V1 responses without NextMarker #1584

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
6 changes: 6 additions & 0 deletions cdm/s3/src/main/java/thredds/filesystem/s3/ControllerS3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ public boolean hasNext() {
// The response was truncated. Make a new request using the next continuation token to pick up where we
// left off.
String continuationToken = useV2 ? responseV2.nextContinuationToken() : responseV1.nextMarker();

// OpenStack Swift may omit NextMarker for a truncated V1 response.
// Continue from the final key returned in the current page.
if (!useV2 && continuationToken == null && responseV1.isTruncated() && !objects.isEmpty()) {
continuationToken = objects.get(objects.size() - 1).key();
}
updateObjectList(continuationToken);
}
}
Expand Down