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

JCLOUDS-844: Local blobstore putBlob ACLs

This commit is contained in:
Andrew Gaul 2015-12-21 16:52:13 -08:00
parent 86491bc607
commit c0d72b6f53
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,28 +520,7 @@ public final class LocalBlobStore implements BlobStore {
@Override @Override
public String putBlob(String containerName, Blob blob) { public String putBlob(String containerName, Blob blob) {
checkNotNull(containerName, "containerName must be set"); return putBlob(containerName, blob, PutOptions.NONE);
checkNotNull(blob, "blob must be set");
String blobKey = blob.getMetadata().getName();
logger.debug("Put blob with key [%s] to container [%s]", blobKey, containerName);
if (!storageStrategy.containerExists(containerName)) {
throw cnfe(containerName);
}
try {
return storageStrategy.putBlob(containerName, blob);
} catch (IOException e) {
String message = e.getMessage();
if (message != null && message.startsWith("MD5 hash code mismatch")) {
HttpResponseException exception = returnResponseException(400);
exception.initCause(e);
throw exception;
}
logger.error(e, "An error occurred storing the new blob with name [%s] to container [%s].", blobKey,
containerName);
throw propagate(e);
}
} }
@Override @Override
@ -740,8 +719,30 @@ public final class LocalBlobStore implements BlobStore {
@Override @Override
public String putBlob(String containerName, Blob blob, PutOptions options) { public String putBlob(String containerName, Blob blob, PutOptions options) {
// TODO implement options checkNotNull(containerName, "containerName must be set");
return putBlob(containerName, blob); checkNotNull(blob, "blob must be set");
String blobKey = blob.getMetadata().getName();
logger.debug("Put blob with key [%s] to container [%s]", blobKey, containerName);
if (!storageStrategy.containerExists(containerName)) {
throw cnfe(containerName);
}
try {
String eTag = storageStrategy.putBlob(containerName, blob);
setBlobAccess(containerName, blobKey, options.getBlobAccess());
return eTag;
} catch (IOException e) {
String message = e.getMessage();
if (message != null && message.startsWith("MD5 hash code mismatch")) {
HttpResponseException exception = returnResponseException(400);
exception.initCause(e);
throw exception;
}
logger.error(e, "An error occurred storing the new blob with name [%s] to container [%s].", blobKey,
containerName);
throw propagate(e);
}
} }
@Override @Override