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

Add missing value in Content-Range header 

This is related with #776. It's necessary to add
the 'bytes' string before the bytes.
This commit is contained in:
Iván López 2015-06-19 08:24:18 +02:00
parent 3a410a25a8
commit f155242838
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -655,7 +655,7 @@ public final class LocalBlobStore implements BlobStore {
}
out.write(data, offset, last - offset + 1);
blob.getAllHeaders().put(HttpHeaders.CONTENT_RANGE,
offset + "-" + last + "/" + data.length);
"bytes " + offset + "-" + last + "/" + data.length);
}
ContentMetadata cmd = blob.getPayload().getContentMetadata();
byte[] byteArray = out.toByteArray();

6
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
View File

@ -397,12 +397,12 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
Blob blob1 = view.getBlobStore().getBlob(container, name, range(0, 5));
validateMetadata(blob1.getMetadata(), container, name);
assertEquals(getContentAsStringOrNullAndClose(blob1), TEST_STRING.substring(0, 6));
assertThat(blob1.getAllHeaders().get(HttpHeaders.CONTENT_RANGE)).containsExactly("0-5/46");
assertThat(blob1.getAllHeaders().get(HttpHeaders.CONTENT_RANGE)).containsExactly("bytes 0-5/46");
Blob blob2 = view.getBlobStore().getBlob(container, name, range(6, TEST_STRING.length()));
validateMetadata(blob2.getMetadata(), container, name);
assertEquals(getContentAsStringOrNullAndClose(blob2), TEST_STRING.substring(6, TEST_STRING.length()));
assertThat(blob2.getAllHeaders().get(HttpHeaders.CONTENT_RANGE)).containsExactly("6-45/46");
assertThat(blob2.getAllHeaders().get(HttpHeaders.CONTENT_RANGE)).containsExactly("bytes 6-45/46");
/* RFC 2616 14.35.1
"If the entity is shorter than the specified suffix-length, the
@ -410,7 +410,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
Blob blob3 = view.getBlobStore().getBlob(container, name, new GetOptions().tail(TEST_STRING.length() + 10));
validateMetadata(blob3.getMetadata(), container, name);
assertEquals(getContentAsStringOrNullAndClose(blob3), TEST_STRING);
assertThat(blob3.getAllHeaders().get(HttpHeaders.CONTENT_RANGE)).containsExactly("0-45/46");
assertThat(blob3.getAllHeaders().get(HttpHeaders.CONTENT_RANGE)).containsExactly("bytes 0-45/46");
} finally {
returnContainer(container);
}