You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2018/02/09 06:39:10 UTC
jclouds git commit: JCLOUDS-1368: Fix off-by-one in slicing algorithm
Repository: jclouds
Updated Branches:
refs/heads/2.0.x 1ffbe59b6 -> 992e60d82
JCLOUDS-1368: Fix off-by-one in slicing algorithm
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/992e60d8
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/992e60d8
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/992e60d8
Branch: refs/heads/2.0.x
Commit: 992e60d82dc979c26a668079adda614e234434df
Parents: 1ffbe59
Author: Andrew Gaul <ga...@apache.org>
Authored: Thu Feb 8 21:00:33 2018 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Thu Feb 8 22:38:53 2018 -0800
----------------------------------------------------------------------
.../main/java/org/jclouds/blobstore/internal/BaseBlobStore.java | 2 +-
.../blobstore/integration/internal/BaseBlobIntegrationTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/992e60d8/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java
index 201bc3d..766462c 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/BaseBlobStore.java
@@ -362,7 +362,7 @@ public abstract class BaseBlobStore implements BlobStore {
long partSize = algorithm.calculateChunkSize(contentLength);
int partNumber = 1;
// TODO: for InputStream payloads, this buffers all parts in-memory!
- while (partNumber < algorithm.getParts()) {
+ while (partNumber <= algorithm.getParts()) {
Payload payload = slicer.slice(blob.getPayload(), algorithm.getCopied(), partSize);
BlobUploader b =
new BlobUploader(mpu, partNumber++, payload);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/992e60d8/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
----------------------------------------------------------------------
diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
index e03b226..01d72ff 100644
--- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
+++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
@@ -757,6 +757,8 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
assertThat(etag).isNotNull();
Blob blob = blobStore.getBlob(container, blobName);
+ assertThat(blob.getMetadata().getContentMetadata().getContentLength()).isEqualTo(length);
+
InputStream is = null;
try {
is = blob.getPayload().openStream();