Follow-up to Azureblob cleanup See discussion at https://github.com/jclouds/jclouds/pull/66
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/2ebde8c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/2ebde8c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/2ebde8c5 Branch: refs/heads/1.6.x Commit: 2ebde8c556afa92fabf51ab535321d84760aef2b Parents: a6f6f04 Author: Andrew Phillips <[email protected]> Authored: Wed Jul 17 10:19:43 2013 -0400 Committer: Andrew Gaul <[email protected]> Committed: Wed Jul 17 10:35:24 2013 -0700 ---------------------------------------------------------------------- .../azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java | 2 +- .../jclouds/azureblob/predicates/validators/BlockIdValidator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2ebde8c5/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java index 4475555..dc4cb5d 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/blobstore/strategy/AzureBlobBlockUploadStrategy.java @@ -82,7 +82,7 @@ public class AzureBlobBlockUploadStrategy implements MultipartUploadStrategy { blockIds.add(blockId); client.putBlock(container, blobName, blockId, block); } - checkState(bytesWritten == length, "Wrote " + bytesWritten + " bytes, but we wanted to write " + length + " bytes"); + checkState(bytesWritten == length, "Wrote %s bytes, but we wanted to write %s bytes", bytesWritten, length); return client.putBlockList(container, blobName, blockIds); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2ebde8c5/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/BlockIdValidator.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/BlockIdValidator.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/BlockIdValidator.java index cd6d53f..c3ecedb 100644 --- a/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/BlockIdValidator.java +++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/predicates/validators/BlockIdValidator.java @@ -33,7 +33,7 @@ import org.jclouds.predicates.Validator; @Singleton public class BlockIdValidator extends Validator<String> { @Override - public void validate(String s) throws IllegalArgumentException { + public void validate(@Nullable String s) throws IllegalArgumentException { if (s == null || s.length() > 64) throw new IllegalArgumentException("block id:" + s + "; Block Ids must be less than or equal to 64 bytes in size");
