Repository: jclouds Updated Branches: refs/heads/swift/range-get-of-manifest-object [created] 77f09c57e
range get of manifest object has no etag Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/77f09c57 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/77f09c57 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/77f09c57 Branch: refs/heads/swift/range-get-of-manifest-object Commit: 77f09c57eafdf72847dc63bb8185ed6c7cad2a32 Parents: 19d5436 Author: Ka-Hing Cheung <[email protected]> Authored: Tue Jul 14 17:15:10 2015 -0700 Committer: Ka-Hing Cheung <[email protected]> Committed: Tue Jul 14 17:15:10 2015 -0700 ---------------------------------------------------------------------- .../openstack/swift/v1/blobstore/functions/ToBlobMetadata.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/77f09c57/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java index 51e9555..8417e83 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/blobstore/functions/ToBlobMetadata.java @@ -47,15 +47,16 @@ public class ToBlobMetadata implements Function<SwiftObject, MutableBlobMetadata if (container.getAnybodyRead().isPresent()) { to.setPublicUri(from.getUri()); } + String eTag = from.getETag(); to.setUri(from.getUri()); - to.setETag(from.getETag()); + to.setETag(eTag); to.setName(from.getName()); to.setLastModified(from.getLastModified()); to.setContentMetadata(from.getPayload().getContentMetadata()); to.getContentMetadata().setContentMD5(from.getPayload().getContentMetadata().getContentMD5AsHashCode()); to.getContentMetadata().setExpires(from.getPayload().getContentMetadata().getExpires()); to.setUserMetadata(from.getMetadata()); - if (from.getETag().equals(ParseObjectListFromResponse.SUBDIR_ETAG)) { + if (eTag != null && eTag.equals(ParseObjectListFromResponse.SUBDIR_ETAG)) { to.setType(StorageType.RELATIVE_PATH); } else { to.setType(StorageType.BLOB);
