Skip to content

Commit 22b2e3c

Browse files
Treat ownerEnforcedBucketPrivacy as nullable
1 parent ba75eea commit 22b2e3c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

dotnet/src/dotnetframework/Providers/Storage/GXAmazonS3/ExternalProviderS3.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class ExternalProviderS3 : ExternalProviderBase, ExternalProvider
5252

5353
bool objectOwnershipEnabled;
5454
private enum BucketPrivacy { PRIVATE, PUBLIC };
55-
private BucketPrivacy ownerEnforcedBucketPrivacy;
55+
private BucketPrivacy? ownerEnforcedBucketPrivacy;
5656

5757
public string StorageUri
5858
{
@@ -110,9 +110,9 @@ private void Initialize() {
110110

111111
string default_storage_privacy = GetPropertyValue(DEFAULT_ACL, DEFAULT_STORAGE_PRIVACY, "");
112112
objectOwnershipEnabled = !default_storage_privacy.Contains("Bucket owner enforced");
113-
ownerEnforcedBucketPrivacy = (BucketPrivacy) (!objectOwnershipEnabled ?
113+
ownerEnforcedBucketPrivacy = (!objectOwnershipEnabled ?
114114
(default_storage_privacy.Contains("private") ? BucketPrivacy.PRIVATE : BucketPrivacy.PUBLIC)
115-
: (BucketPrivacy?) null);
115+
: null);
116116

117117
#if NETCORE
118118
if (credentials != null)
@@ -252,7 +252,7 @@ private bool IsPrivateUpload(GxFileType fileType)
252252
if (objectOwnershipEnabled && GetCannedACL(fileType) != S3CannedACL.PublicRead)
253253
return true;
254254
else
255-
return ownerEnforcedBucketPrivacy == BucketPrivacy.PRIVATE;
255+
return ownerEnforcedBucketPrivacy.HasValue && ownerEnforcedBucketPrivacy == BucketPrivacy.PRIVATE;
256256
}
257257

258258
public string Get(string objectName, GxFileType fileType, int urlMinutes = 0)

0 commit comments

Comments
 (0)