Skip to content

Commit 8aea8b3

Browse files
committed
Remove buffer copy since it's no longer needed
1 parent 9df97c6 commit 8aea8b3

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<rxjava.version>2.2.21</rxjava.version>
113113
<commons-codec.verion>1.10</commons-codec.verion>
114114
<jmh.version>1.29</jmh.version>
115-
<awscrt.version>0.13.5</awscrt.version>
115+
<awscrt.version>0.13.11</awscrt.version>
116116

117117
<!--Test dependencies -->
118118
<junit.version>4.13.1</junit.version>

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import software.amazon.awssdk.crt.http.HttpHeader;
2626
import software.amazon.awssdk.http.SdkHttpResponse;
2727
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
28-
import software.amazon.awssdk.utils.BinaryUtils;
2928
import software.amazon.awssdk.utils.Logger;
3029

3130
/**
@@ -81,10 +80,7 @@ public void onResponse(GetObjectOutput output) {
8180
@Override
8281
public void onResponseData(ByteBuffer byteBuffer) {
8382
log.trace(() -> "Received data of size " + byteBuffer.remaining());
84-
85-
// Need to make a copy because the incoming byteBuffer might get released soon
86-
ByteBuffer newByteBuffer = ByteBuffer.wrap(BinaryUtils.copyAllBytesFrom(byteBuffer));
87-
publisher.deliverData(newByteBuffer);
83+
publisher.deliverData(byteBuffer);
8884
}
8985

9086
@Override

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,4 @@ public void onResponse_noSdkHttpResponse_shouldCreateEmptySdkHttpResponse() {
5454
assertThat(captor.getValue().responseMetadata().requestId()).isEqualTo("UNKNOWN");
5555
assertThat(captor.getValue().sdkHttpResponse()).isNotNull();
5656
}
57-
58-
@Test
59-
public void onResponseData_shouldCopyByteBuffer() {
60-
ArgumentCaptor<ByteBuffer> captor = ArgumentCaptor.forClass(ByteBuffer.class);
61-
byte[] expectedBytes = "helloworld".getBytes(StandardCharsets.UTF_8);
62-
ByteBuffer byteBuffer = ByteBuffer.wrap(expectedBytes);
63-
adapter.onResponseData(byteBuffer);
64-
65-
verify(publisher).deliverData(captor.capture());
66-
ByteBuffer actualByteBuffer = captor.getValue();
67-
assertThat(actualByteBuffer).isNotSameAs(byteBuffer);
68-
assertThat(actualByteBuffer.array()).isEqualTo(expectedBytes);
69-
}
7057
}

0 commit comments

Comments
 (0)