Don’t overwrite possibly non-nil error with nil

golang · Oct 1, 2020 · f665a81 · f665a81
1 parent 04bfcb1
commit f665a81
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
@@ -851,7 +851,10 @@ func (db *DB) Close() error {
 	}
 	db.stop()
 	if c, ok := db.connector.(io.Closer); ok {
-		err = c.Close()
+		err1 := c.Close()
+		if err1 != nil {
+			err = err1
+		}
 	}
 	return err
 }