diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-01-08 21:50:59 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-01-08 21:50:59 -0800 |
| commit | 8dd260623e2b2e6452df53529f143a63eeec4676 (patch) | |
| tree | 997f6a36b9df481f4482dafc278412921fca2dc0 | |
| parent | 89e16bd2e8edabee4d5b09c29dcc31ae023dc18d (diff) | |
| download | seaweedfs-8dd260623e2b2e6452df53529f143a63eeec4676.tar.xz seaweedfs-8dd260623e2b2e6452df53529f143a63eeec4676.zip | |
protect against nil deletion results
fix https://github.com/chrislusf/seaweedfs/issues/1180
| -rw-r--r-- | weed/operation/delete_content.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/weed/operation/delete_content.go b/weed/operation/delete_content.go index 358399324..e4aa6c6d3 100644 --- a/weed/operation/delete_content.go +++ b/weed/operation/delete_content.go @@ -4,12 +4,14 @@ import ( "context" "errors" "fmt" - "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" - "google.golang.org/grpc" "net/http" "strings" "sync" + + "google.golang.org/grpc" + + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" ) type DeleteResult struct { @@ -94,7 +96,7 @@ func DeleteFilesWithLookupVolumeId(grpcDialOption grpc.DialOption, fileIds []str if deleteResults, deleteErr := DeleteFilesAtOneVolumeServer(server, grpcDialOption, fidList); deleteErr != nil { err = deleteErr - } else { + } else if deleteResults != nil { resultChan <- deleteResults } |