Browse Source

s3: break loop if error

fix #1701
pull/1702/head
Chris Lu 4 years ago
parent
commit
0ca9d89589
  1. 2
      weed/s3api/s3api_objects_list_handlers.go

2
weed/s3api/s3api_objects_list_handlers.go

@ -315,7 +315,7 @@ func (s3a *S3ApiServer) isDirectoryAllEmpty(filerClient filer_pb.SeaweedFilerCli
currentDir := parentDir + "/" + name currentDir := parentDir + "/" + name
var startFrom string var startFrom string
var isExhausted bool var isExhausted bool
for fileCounter == 0 && !isExhausted {
for fileCounter == 0 && !isExhausted && err == nil {
err = filer_pb.SeaweedList(filerClient, currentDir, "", func(entry *filer_pb.Entry, isLast bool) error { err = filer_pb.SeaweedList(filerClient, currentDir, "", func(entry *filer_pb.Entry, isLast bool) error {
if entry.IsDirectory { if entry.IsDirectory {
subDirs = append(subDirs, entry.Name) subDirs = append(subDirs, entry.Name)

Loading…
Cancel
Save