Skip to content

Commit 9d91440

Browse files
Fix in transfer manager
1 parent a00e4d3 commit 9d91440

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3TransferManagerPresignedUrlDownloadIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void downloadFileWithPresignedUrl_progressTracking(String tmType, S3TransferMana
128128
PresignedUrlDownloadRequest.Builder requestBuilder = PresignedUrlDownloadRequest.builder()
129129
.presignedUrl(createPresignedRequest(key).url());
130130
if (range != null) {
131-
requestBuilder.range(range);
131+
requestBuilder.putHeader("Range", range);
132132
}
133133

134134
PresignedFileDownload download = tm.downloadFileWithPresignedUrl(
@@ -159,7 +159,7 @@ void downloadWithPresignedUrl_toBytes_progressTracking(String tmType, S3Transfer
159159
PresignedUrlDownloadRequest.Builder requestBuilder = PresignedUrlDownloadRequest.builder()
160160
.presignedUrl(createPresignedRequest(key).url());
161161
if (range != null) {
162-
requestBuilder.range(range);
162+
requestBuilder.putHeader("Range", range);
163163
}
164164

165165
Download<ResponseBytes<GetObjectResponse>> download = tm.downloadWithPresignedUrl(

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/GenericS3TransferManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ public final PresignedFileDownload downloadFileWithPresignedUrl(PresignedDownloa
615615
progressUpdater.transferInitiated();
616616

617617
responseTransformer = isS3ClientMultipartEnabled()
618-
&& presignedDownloadFileRequest.presignedUrlDownloadRequest().range() == null
618+
&& !presignedDownloadFileRequest.presignedUrlDownloadRequest().headers().containsKey("Range")
619619
? progressUpdater.wrapForNonSerialFileDownload(
620620
responseTransformer, GetObjectRequest.builder().build())
621621
: progressUpdater.wrapResponseTransformer(responseTransformer);
@@ -651,7 +651,7 @@ public final <ResultT> Download<ResultT> downloadWithPresignedUrl(
651651
progressUpdater.transferInitiated();
652652

653653
responseTransformer = isS3ClientMultipartEnabled()
654-
&& presignedDownloadRequest.presignedUrlDownloadRequest().range() == null
654+
&& !presignedDownloadRequest.presignedUrlDownloadRequest().headers().containsKey("Range")
655655
? progressUpdater.wrapForNonSerialFileDownload(
656656
responseTransformer, GetObjectRequest.builder().build())
657657
: progressUpdater.wrapResponseTransformer(responseTransformer);

services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/S3TransferManagerPresignedUrlListenerWiremockTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void presignedUrlDownload_shouldInvokeListener(boolean multipartEnabled, String
119119
PresignedUrlDownloadRequest.Builder requestBuilder = PresignedUrlDownloadRequest.builder()
120120
.presignedUrl(presignedUrl);
121121
if (range != null) {
122-
requestBuilder.range(range);
122+
requestBuilder.putHeader("Range", range);
123123
}
124124

125125
if ("toFile".equals(type)) {

0 commit comments

Comments
 (0)