Dispose tx if locking fails

PawelGerr · PawelGerr · commit 4098ab566da7 · 2023-05-22T12:36:22.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Copyright>(c) $([System.DateTime]::Now.Year), Pawel Gerr. All rights reserved.</Copyright>
-    <VersionPrefix>7.2.0</VersionPrefix>
+    <VersionPrefix>7.2.1</VersionPrefix>
     <Authors>Pawel Gerr</Authors>    
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageProjectUrl>https://dev.azure.com/pawelgerr/Thinktecture.EntityFrameworkCore</PackageProjectUrl>
diff --git a/src/Thinktecture.EntityFrameworkCore.SqlServer.Testing/EntityFrameworkCore/Testing/SqlServerTestDbContextProvider.cs b/src/Thinktecture.EntityFrameworkCore.SqlServer.Testing/EntityFrameworkCore/Testing/SqlServerTestDbContextProvider.cs
@@ -265,11 +265,10 @@ protected virtual IDbContextTransaction BeginTransaction(T ctx)
          }
          catch (Exception)
          {
+            tx.Dispose();
+
             if (i > _maxNumberOfLockRetries)
-            {
-               tx.Dispose();
                throw;
-            }
 
             var delay = new TimeSpan(_random.NextInt64(_minRetryDelay.Ticks, _maxRetryDelay.Ticks));
             Task.Delay(delay).GetAwaiter().GetResult();

Original file line number	Diff line number	Diff line change
`@@ -265,11 +265,10 @@ protected virtual IDbContextTransaction BeginTransaction(T ctx)`
`265`	`265`	`}`
`266`	`266`	`catch (Exception)`
`267`	`267`	`{`
	`268`	`+ tx.Dispose();`
	`269`	`+`
`268`	`270`	`if (i > _maxNumberOfLockRetries)`
`269`		`- {`
`270`		`- tx.Dispose();`
`271`	`271`	`throw;`
`272`		`- }`
`273`	`272`
`274`	`273`	`var delay = new TimeSpan(_random.NextInt64(_minRetryDelay.Ticks, _maxRetryDelay.Ticks));`
`275`	`274`	`Task.Delay(delay).GetAwaiter().GetResult();`