Merge pull request #1254 from dmytro-gokun/2019-05-06-fix-rainbow-database-dispose

NickCraver · web-flow · commit 7af97799bcd9 · 2021-05-09T19:06:30.000-04:00
diff --git a/Dapper.Rainbow/Database.cs b/Dapper.Rainbow/Database.cs
@@ -473,12 +473,12 @@ public SqlMapper.GridReader QueryMultiple(string sql, dynamic param = null, IDbT
         /// </summary>
         public virtual void Dispose()
         {
-            if (_connection.State != ConnectionState.Closed)
+            var connection = _connection;
+            if (connection.State != ConnectionState.Closed)
             {
-                _transaction?.Rollback();
-
-                _connection.Close();
                 _connection = null;
+                _transaction = null;
+                connection?.Close();
             }
             GC.SuppressFinalize(this);
         }

Original file line number	Diff line number	Diff line change
`@@ -473,12 +473,12 @@ public SqlMapper.GridReader QueryMultiple(string sql, dynamic param = null, IDbT`
`473`	`473`	`/// </summary>`
`474`	`474`	`public virtual void Dispose()`
`475`	`475`	`{`
`476`		`- if (_connection.State != ConnectionState.Closed)`
	`476`	`+ var connection = _connection;`
	`477`	`+ if (connection.State != ConnectionState.Closed)`
`477`	`478`	`{`
`478`		`- _transaction?.Rollback();`
`479`		`-`
`480`		`- _connection.Close();`
`481`	`479`	`_connection = null;`
	`480`	`+ _transaction = null;`
	`481`	`+ connection?.Close();`
`482`	`482`	`}`
`483`	`483`	`GC.SuppressFinalize(this);`
`484`	`484`	`}`