From e1a0a1e73c46fbb909090f9b4e09f9eee8c82588 Mon Sep 17 00:00:00 2001 From: Klaus Post Date: Thu, 20 Jan 2022 10:55:18 -0800 Subject: [PATCH] fs: Return prefix as listing marker if no objects (#14143) Fixes #14132 --- cmd/object-api-common.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/object-api-common.go b/cmd/object-api-common.go index edb1ce542..69b12991b 100644 --- a/cmd/object-api-common.go +++ b/cmd/object-api-common.go @@ -164,6 +164,8 @@ func listObjectsNonSlash(ctx context.Context, bucket, prefix, marker, delimiter result.IsTruncated = true if len(objInfos) > 0 { result.NextMarker = objInfos[len(objInfos)-1].Name + } else if len(result.Prefixes) > 0 { + result.NextMarker = result.Prefixes[len(result.Prefixes)-1] } } @@ -399,6 +401,8 @@ func listObjects(ctx context.Context, obj ObjectLayer, bucket, prefix, marker, d result.IsTruncated = true if len(objInfos) > 0 { result.NextMarker = objInfos[len(objInfos)-1].Name + } else if len(result.Prefixes) > 0 { + result.NextMarker = result.Prefixes[len(result.Prefixes)-1] } }