Ensure bufferWriter is always closed and error is returned in Buffer()

chandrakant-cohesity · chandrakant-cohesity · commit 849fb88bae91 · 2025-08-20T00:44:53.000+05:30
diff --git a/migration.go b/migration.go
@@ -131,7 +131,7 @@ func (m *Migration) Buffer() error {
 	// Always close bufferWriter, even on error, to prevent deadlocks.
 	// This lets Buffer know that there is no more data coming.
 	defer func() {
-		if err := m.bufferWriter.Close(); err != nil {
+		if err := m.bufferWriter.Close(); err != nil && bufferWriterCloseErr == nil {
 			bufferWriterCloseErr = err
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func (m *Migration) Buffer() error {`
`131`	`131`	`// Always close bufferWriter, even on error, to prevent deadlocks.`
`132`	`132`	`// This lets Buffer know that there is no more data coming.`
`133`	`133`	`defer func() {`
`134`		`- if err := m.bufferWriter.Close(); err != nil {`
	`134`	`+ if err := m.bufferWriter.Close(); err != nil && bufferWriterCloseErr == nil {`
`135`	`135`	`bufferWriterCloseErr = err`
`136`	`136`	`}`
`137`	`137`	`}()`