File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -196,16 +196,17 @@ func getBucketAttributes(path string) (BucketAttrs, error) {
196196
197197// DeleteBucket removes the bucket from the backend.
198198func (s * storageFS ) DeleteBucket (name string ) error {
199- objs , err := s .ListObjects (name , "" , false )
199+ s .mtx .Lock ()
200+ defer s .mtx .Unlock ()
201+
202+ objs , err := s .listObjects (name , "" , false )
200203 if err != nil {
201204 return BucketNotFound
202205 }
203206 if len (objs ) > 0 {
204207 return BucketNotEmpty
205208 }
206209
207- s .mtx .Lock ()
208- defer s .mtx .Unlock ()
209210 return os .RemoveAll (filepath .Join (s .rootDir , url .PathEscape (name )))
210211}
211212
@@ -314,7 +315,10 @@ func (s *storageFS) createObject(obj StreamingObject, conditions Conditions) (St
314315func (s * storageFS ) ListObjects (bucketName string , prefix string , versions bool ) ([]ObjectAttrs , error ) {
315316 s .mtx .RLock ()
316317 defer s .mtx .RUnlock ()
318+ return s .listObjects (bucketName , prefix , versions )
319+ }
317320
321+ func (s * storageFS ) listObjects (bucketName string , prefix string , versions bool ) ([]ObjectAttrs , error ) {
318322 objects := []ObjectAttrs {}
319323 bucketPath := filepath .Join (s .rootDir , url .PathEscape (bucketName ))
320324 if err := filepath .Walk (bucketPath , func (path string , info fs.FileInfo , err error ) error {
You can’t perform that action at this time.
0 commit comments