Repository: jclouds Updated Branches: refs/heads/master a17cf61cf -> b93270aef
JCLOUDS-1337: only set fs tier when non-null Fixes regression from 61d4be87467afd830208db9bbaa60df36eff8323. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/b93270ae Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/b93270ae Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/b93270ae Branch: refs/heads/master Commit: b93270aef26d850f96cce2965eb622bc0b7d5032 Parents: a17cf61 Author: Andrew Gaul <[email protected]> Authored: Fri Oct 20 20:51:50 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Oct 20 20:51:50 2017 -0700 ---------------------------------------------------------------------- .../org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/b93270ae/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java index 48bae93..0ac6151 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/functions/BlobToObjectMetadata.java @@ -49,7 +49,9 @@ public class BlobToObjectMetadata implements Function<BlobMetadata, MutableObjec for (Entry<String, String> entry : from.getUserMetadata().entrySet()) to.getUserMetadata().put(entry.getKey().toLowerCase(), entry.getValue()); } - to.setStorageClass(StorageClass.fromTier(from.getTier())); + if (from.getTier() != null) { + to.setStorageClass(StorageClass.fromTier(from.getTier())); + } return to; }
