Skip to content

Fix for null reference exceptions in SqlDelegatedTransaction methods #563

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

Merged
merged 3 commits into from
May 13, 2020
Merged

Fix for null reference exceptions in SqlDelegatedTransaction methods #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63d75a2
Merge pull request #1 from dotnet/master
May 13, 2020
2add1a9
Fix NRE by writing "null" instead of connection.ObjectID
johnnypham May 13, 2020
1d9e47a
change event descriptions
johnnypham May 13, 2020
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
6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public byte[] Promote()
else
{
// The transaction was aborted externally, doom the connection to make sure it's eventually rolled back and log the same.
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.Promote|RES|CPOOL> {0}, Connection {1}, aborted before promoting.", ObjectID, connection.ObjectID);
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.Promote|RES|CPOOL> {0}, Connection null, aborted before promoting.", ObjectID);
}
return returnValue;
}
Expand Down Expand Up @@ -304,7 +304,7 @@ public void Rollback(SinglePhaseEnlistment enlistment)
{
// The transaction was aborted, report that to SysTx and log the same.
enlistment.Aborted();
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.Rollback|RES|CPOOL> {0}, Connection {1}, aborted before rollback.", ObjectID, connection.ObjectID);
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.Rollback|RES|CPOOL> {0}, Connection null, aborted before rollback.", ObjectID);
}
}

Expand Down Expand Up @@ -421,7 +421,7 @@ public void SinglePhaseCommit(SinglePhaseEnlistment enlistment)
{
// The transaction was aborted before we could commit, report that to SysTx and log the same.
enlistment.Aborted();
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.SinglePhaseCommit|RES|CPOOL> {0}, Connection {1}, aborted before commit.", ObjectID, connection.ObjectID);
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.SinglePhaseCommit|RES|CPOOL> {0}, Connection null, aborted before commit.", ObjectID);
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public Byte[] Promote()
else
{
// The transaction was aborted externally, doom the connection to make sure it's eventually rolled back and log the same.
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.Promote|RES|CPOOL> {0}, Connection {1}, aborted before promote.", ObjectID, connection.ObjectID);
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.Promote|RES|CPOOL> {0}, Connection null, aborted before promoting.", ObjectID);
}
return returnValue;
}
Expand Down Expand Up @@ -364,7 +364,7 @@ public void Rollback(SysTx.SinglePhaseEnlistment enlistment)
{
// The transaction was aborted, report that to SysTx and log the same.
enlistment.Aborted();
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.Rollback|RES|CPOOL> {0}, Connection {1}, aborted before rollback.", ObjectID, connection.ObjectID);
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.Rollback|RES|CPOOL> {0}, Connection null, aborted before rollback.", ObjectID);
}
}

Expand Down Expand Up @@ -501,7 +501,7 @@ public void SinglePhaseCommit(SysTx.SinglePhaseEnlistment enlistment)
{
// The transaction was aborted before we could commit, report that to SysTx and log the same.
enlistment.Aborted();
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.SinglePhaseCommit|RES|CPOOL> {0}, Connection {1}, aborted before commit.", ObjectID, connection.ObjectID);
SqlClientEventSource.Log.TraceEvent("<sc.SqlDelegatedTransaction.SinglePhaseCommit|RES|CPOOL> {0}, Connection null, aborted before commit.", ObjectID);
}
}

Expand Down