Merge pull request #1503 from 0chain/fix/renamedir-v1

dabasov · web-flow · commit 4875cb5d0a7c · 2024-11-08T18:32:07.000+02:00
Fix rename for v1
diff --git a/code/go/0chain.net/blobbercore/handler/object_operation_handler.go b/code/go/0chain.net/blobbercore/handler/object_operation_handler.go
@@ -1280,7 +1280,7 @@ func (fsh *StorageHandler) RenameObject(ctx context.Context, r *http.Request) (i
 		return nil, common.NewError("invalid_operation", "cannot rename root path")
 	}
 
-	if objectRef.Type != reference.FILE {
+	if allocationObj.IsStorageV2() && objectRef.Type == reference.DIRECTORY {
 		isEmpty, err := reference.IsDirectoryEmpty(ctx, allocationID, objectRef.Path)
 		if err != nil {
 			return nil, common.NewError("invalid_operation", "Error checking if directory is empty "+err.Error())

Original file line number	Diff line number	Diff line change
`@@ -1280,7 +1280,7 @@ func (fsh StorageHandler) RenameObject(ctx context.Context, r http.Request) (i`
`1280`	`1280`	`return nil, common.NewError("invalid_operation", "cannot rename root path")`
`1281`	`1281`	`}`
`1282`	`1282`
`1283`		`- if objectRef.Type != reference.FILE {`
	`1283`	`+ if allocationObj.IsStorageV2() && objectRef.Type == reference.DIRECTORY {`
`1284`	`1284`	`isEmpty, err := reference.IsDirectoryEmpty(ctx, allocationID, objectRef.Path)`
`1285`	`1285`	`if err != nil {`
`1286`	`1286`	`return nil, common.NewError("invalid_operation", "Error checking if directory is empty "+err.Error())`