Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix | Fix possible server connection leak if an exception occurs in pooling layer #890

Merged
merged 8 commits into from
Apr 14, 2021
+241 −8
Merged

Fix | Fix possible server connection leak if an exception occurs in pooling layer #890

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4586cf0
Fix | Fix possible server connection leak if an exception occurs in p…
cheenamalhotra Jan 26, 2021
8fb621f
Additional null checks
cheenamalhotra Jan 26, 2021
798e58c
Merge branch 'master' of https://github.com/dotnet/SqlClient into fix…
cheenamalhotra Feb 26, 2021
8c567c6
Merge branch 'main' into fixConnectionLeak
cheenamalhotra Apr 9, 2021
0696614
Add test case for `Internal .NET Framework Data Provider error 6.`
cheenamalhotra Apr 12, 2021
66b8fd5
Simplify + speed up test
cheenamalhotra Apr 12, 2021
3813be2
Review feedback applied
cheenamalhotra Apr 12, 2021
b8c2b46
Assert connection Open
cheenamalhotra Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,14 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio

CheckPoolBlockingPeriod(e);

// Close associated Parser if connection already established.
if (newObj != null && newObj.IsConnectionAlive())
{
newObj.Dispose();
}

newObj = null; // set to null, so we do not return bad new object

// Failed to create instance
_resError = e;

Expand Down
7 changes: 7 additions & 0 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,14 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
throw;
}

// Close associated Parser if connection already established.
if (newObj != null && newObj.IsConnectionAlive())
{
newObj.Dispose();
}

newObj = null; // set to null, so we do not return bad new object

// Failed to create instance
_resError = e;

Expand Down