Merge pull request #1 from chrislusf/master

sync

1 files changed, 5 insertions, 6 deletions

diff --git a/weed/operation/delete_content.go b/weed/operation/delete_content.go
index 6d84be76f..361c09e7e 100644
--- a/weed/operation/delete_content.go
+++ b/weed/operation/delete_content.go
@@ -4,12 +4,13 @@ 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/pb/volume_server_pb"
 )
 
 type DeleteResult struct {
@@ -94,7 +95,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
 			}
 
@@ -107,8 +108,6 @@ func DeleteFilesWithLookupVolumeId(grpcDialOption grpc.DialOption, fileIds []str
 		ret = append(ret, result...)
 	}
 
-	glog.V(0).Infof("deleted %d items", len(ret))
-
 	return ret, err
 }