Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid buffering ByteSource when not needed 

This allows range requests of large files to work.  Regression from
79fe91bd03.
This commit is contained in:
Andrew Gaul 2015-11-19 14:57:05 -08:00
parent 2efcb2c5a9
commit 8d87bfc61b
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
View File

@ -84,8 +84,6 @@ import org.jclouds.io.ByteStreams2;
import org.jclouds.io.ContentMetadata;
import org.jclouds.io.ContentMetadataCodec;
import org.jclouds.io.Payload;
import org.jclouds.io.payloads.ByteArrayPayload;
import org.jclouds.io.payloads.FilePayload;
import org.jclouds.logging.Logger;
import org.jclouds.util.Closeables2;
@ -662,17 +660,16 @@ public final class LocalBlobStore implements BlobStore {
long size = 0;
ImmutableList.Builder<ByteSource> streams = ImmutableList.builder();
// We must call getRawContent to work around Blob.setPayload calling ByteSourcePayload.release. If the
// Local blobstore returns a ByteArrayPayload or FilePayload it uses a stream, otherwise it uses a
// byte array.
// Try to convert payload to ByteSource, otherwise wrap it.
ByteSource byteSource;
try {
Object inputStream = blob.getPayload().getRawContent();
byteSource = (inputStream instanceof ByteArrayPayload || inputStream instanceof FilePayload) ?
(ByteSource) blob.getPayload().getRawContent()
: ByteSource.wrap(ByteStreams2.toByteArrayAndClose(blob.getPayload().openStream()));
} catch (IOException e) {
throw new RuntimeException(e);
byteSource = (ByteSource) blob.getPayload().getRawContent();
} catch (ClassCastException cce) {
try {
byteSource = ByteSource.wrap(ByteStreams2.toByteArrayAndClose(blob.getPayload().openStream()));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
for (String s : options.getRanges()) {