mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Prefer Java 9 InputStream.readAllBytes

pull/733/head
Andrew Gaul 2024-11-24 14:37:49 -08:00
rodzic 595a7f918c
commit 83bc9f7f7f
2 zmienionych plików z 3 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
src/main/java/org/gaul/s3proxy/NullBlobStore.java
Wyświetl plik

@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.hash.HashCode; import com.google.common.hash.HashCode;
import com.google.common.io.ByteSource; import com.google.common.io.ByteSource;
import com.google.common.io.ByteStreams;
import com.google.common.primitives.Longs; import com.google.common.primitives.Longs;
import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStore;
@ -81,7 +80,7 @@ final class NullBlobStore extends ForwardingBlobStore {
byte[] array; byte[] array;
try (InputStream is = blob.getPayload().openStream()) { try (InputStream is = blob.getPayload().openStream()) {
array = ByteStreams.toByteArray(is); array = is.readAllBytes();
} catch (IOException ioe) { } catch (IOException ioe) {
throw new RuntimeException(ioe); throw new RuntimeException(ioe);
} }

4
src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
Wyświetl plik

@ -577,8 +577,8 @@ public class S3ProxyHandler {
} else { } else {
// buffer the entire stream to calculate digest // buffer the entire stream to calculate digest
// why input stream read contentlength of header? // why input stream read contentlength of header?
payload = ByteStreams.toByteArray(ByteStreams.limit( payload = ByteStreams.limit(is, v4MaxNonChunkedRequestSize + 1)
is, v4MaxNonChunkedRequestSize + 1)); .readAllBytes();
if (payload.length == v4MaxNonChunkedRequestSize + 1) { if (payload.length == v4MaxNonChunkedRequestSize + 1) {
throw new S3Exception( throw new S3Exception(
S3ErrorCode.MAX_MESSAGE_LENGTH_EXCEEDED); S3ErrorCode.MAX_MESSAGE_LENGTH_EXCEEDED);