Merge pull request #756 from harshavardhana/pr_out_fix_a_crash_during_listobjects_populating_nextmarker

Fix a crash during listObjects() populating NextMarker
master
Harshavardhana 9 years ago
commit 49c705da99
  1. 6
      pkg/donut/donut-v2.go

@ -545,9 +545,6 @@ func (donut API) ListObjects(bucket string, resources BucketResourcesMetadata, s
}
resources.CommonPrefixes = listObjects.CommonPrefixes
resources.IsTruncated = listObjects.IsTruncated
if resources.IsTruncated && resources.Delimiter != "" {
resources.NextMarker = results[len(results)-1].Object
}
for key := range listObjects.Objects {
keys = append(keys, key)
}
@ -555,6 +552,9 @@ func (donut API) ListObjects(bucket string, resources BucketResourcesMetadata, s
for _, key := range keys {
results = append(results, listObjects.Objects[key])
}
if resources.IsTruncated && resources.Delimiter != "" {
resources.NextMarker = results[len(results)-1].Object
}
return results, resources, nil
}
storedBucket := donut.storedBuckets.Get(bucket).(storedBucket)

Loading…
Cancel
Save