From 0805752731f4828ac56d4e733a7564a9b333f14b Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 5 Jan 2021 16:25:08 -0500 Subject: [PATCH] fix CECSConnection::S3GetLifecycle() GFW-965: Lifecycle Rules: Expired Object Delete Marker checkbox always shows CHECKED even if it is not set --- ECSUtil/ECSConnection.cpp | 3 +++ ECSUtil/Version.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ECSUtil/ECSConnection.cpp b/ECSUtil/ECSConnection.cpp index 1aa64d3..611c596 100644 --- a/ECSUtil/ECSConnection.cpp +++ b/ECSUtil/ECSConnection.cpp @@ -7064,6 +7064,7 @@ HRESULT XmlS3LifecycleInfoCB(const CStringW& sXmlPath, void *pContext, IXmlReade if (sXmlPath.CompareNoCase(XML_S3_LIFECYCLE_INFO_RULE) == 0) { pInfo->LastRule.Empty(); + pInfo->LastRule.bExpiredDeleteMarkers = false; } break; case XmlNodeType_EndElement: @@ -7074,6 +7075,7 @@ HRESULT XmlS3LifecycleInfoCB(const CStringW& sXmlPath, void *pContext, IXmlReade { pInfo->pLifecycleInfo->LifecycleRules.push_back(pInfo->LastRule); pInfo->LastRule.Empty(); + pInfo->LastRule.bExpiredDeleteMarkers = false; } } break; @@ -7098,6 +7100,7 @@ CECSConnection::S3_ERROR CECSConnection::S3GetLifecycle(LPCTSTR pszBucket, S3_LI if (!RetData.IsEmpty()) { XML_S3_LIFECYCLE_INFO_CONTEXT Context; + Context.LastRule.bExpiredDeleteMarkers = false; Context.pLifecycleInfo = &Lifecycle; HRESULT hr = ScanXml(&RetData, &Context, XmlS3LifecycleInfoCB); if (FAILED(hr)) diff --git a/ECSUtil/Version.h b/ECSUtil/Version.h index e0502c5..6f222a6 100644 --- a/ECSUtil/Version.h +++ b/ECSUtil/Version.h @@ -15,6 +15,6 @@ #pragma once -#define ECSUTIL_COPYRIGHT _T("Copyright © 2020 Dell Inc. or its subsidiaries.") +#define ECSUTIL_COPYRIGHT _T("Copyright © 2021 Dell Inc. or its subsidiaries.") -#define ECSUTIL_VERSION "v1.0.7.15" +#define ECSUTIL_VERSION "v1.0.7.16"