kopia lustrzana https://github.com/gaul/s3proxy
commonPrefixes is only for delimiter request; check size and tier null
rodzic
608934309b
commit
2a44bcd709
|
@ -1506,8 +1506,11 @@ public class S3ProxyHandler {
|
||||||
case FOLDER:
|
case FOLDER:
|
||||||
// fallthrough
|
// fallthrough
|
||||||
case RELATIVE_PATH:
|
case RELATIVE_PATH:
|
||||||
commonPrefixes.add(metadata.getName());
|
if (delimiter != null) {
|
||||||
continue;
|
commonPrefixes.add(metadata.getName());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1528,10 +1531,15 @@ public class S3ProxyHandler {
|
||||||
writeSimpleElement(xml, "ETag", maybeQuoteETag(eTag));
|
writeSimpleElement(xml, "ETag", maybeQuoteETag(eTag));
|
||||||
}
|
}
|
||||||
|
|
||||||
writeSimpleElement(xml, "Size",
|
Long size = metadata.getSize();
|
||||||
String.valueOf(metadata.getSize()));
|
if (size != null) {
|
||||||
writeSimpleElement(xml, "StorageClass",
|
writeSimpleElement(xml, "Size", String.valueOf(size));
|
||||||
StorageClass.fromTier(metadata.getTier()).toString());
|
}
|
||||||
|
|
||||||
|
Tier tier = metadata.getTier();
|
||||||
|
if (tier != null) {
|
||||||
|
writeSimpleElement(xml, "StorageClass", StorageClass.fromTier(tier).toString());
|
||||||
|
}
|
||||||
|
|
||||||
if (fetchOwner) {
|
if (fetchOwner) {
|
||||||
writeOwnerStanza(xml);
|
writeOwnerStanza(xml);
|
||||||
|
|
Ładowanie…
Reference in New Issue