Skip to content

Commit 58ea02a

Browse files
cincuranetcincuranet
committed
Fix NRE after transaction is committed (#1072).
1 parent 5c05833 commit 58ea02a

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

‎src/FirebirdSql.Data.FirebirdClient/Logging/LogMessages.cs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ public static void TransactionBeginning(IFbLogger log, FbTransaction transaction
130130
return;
131131

132132
var sb = new StringBuilder();
133-
sb.AppendLine("Beginning transaction.");
133+
sb.AppendLine("Beginning transaction:");
134+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
134135
log.Debug(sb.ToString());
135136
}
136137
public static void TransactionBegan(IFbLogger log, FbTransaction transaction)
@@ -140,7 +141,7 @@ public static void TransactionBegan(IFbLogger log, FbTransaction transaction)
140141

141142
var sb = new StringBuilder();
142143
sb.AppendLine("Began transaction:");
143-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
144+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
144145
log.Debug(sb.ToString());
145146
}
146147
public static void TransactionCommitting(IFbLogger log, FbTransaction transaction)
@@ -150,7 +151,7 @@ public static void TransactionCommitting(IFbLogger log, FbTransaction transactio
150151

151152
var sb = new StringBuilder();
152153
sb.AppendLine("Committing transaction:");
153-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
154+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
154155
log.Debug(sb.ToString());
155156
}
156157
public static void TransactionCommitted(IFbLogger log, FbTransaction transaction)
@@ -160,7 +161,7 @@ public static void TransactionCommitted(IFbLogger log, FbTransaction transaction
160161

161162
var sb = new StringBuilder();
162163
sb.AppendLine("Committed transaction:");
163-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
164+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
164165
log.Debug(sb.ToString());
165166
}
166167
public static void TransactionRollingBack(IFbLogger log, FbTransaction transaction)
@@ -170,7 +171,7 @@ public static void TransactionRollingBack(IFbLogger log, FbTransaction transacti
170171

171172
var sb = new StringBuilder();
172173
sb.AppendLine("Rolling back transaction:");
173-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
174+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
174175
log.Debug(sb.ToString());
175176
}
176177
public static void TransactionRolledBack(IFbLogger log, FbTransaction transaction)
@@ -180,7 +181,7 @@ public static void TransactionRolledBack(IFbLogger log, FbTransaction transactio
180181

181182
var sb = new StringBuilder();
182183
sb.AppendLine("Rolled back transaction:");
183-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
184+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
184185
log.Debug(sb.ToString());
185186
}
186187
public static void TransactionSaving(IFbLogger log, FbTransaction transaction)
@@ -190,7 +191,7 @@ public static void TransactionSaving(IFbLogger log, FbTransaction transaction)
190191

191192
var sb = new StringBuilder();
192193
sb.AppendLine("Creating savepoint:");
193-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
194+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
194195
log.Debug(sb.ToString());
195196
}
196197
public static void TransactionSaved(IFbLogger log, FbTransaction transaction)
@@ -200,7 +201,7 @@ public static void TransactionSaved(IFbLogger log, FbTransaction transaction)
200201

201202
var sb = new StringBuilder();
202203
sb.AppendLine("Created savepoint:");
203-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
204+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
204205
log.Debug(sb.ToString());
205206
}
206207
public static void TransactionReleasingSavepoint(IFbLogger log, FbTransaction transaction)
@@ -210,7 +211,7 @@ public static void TransactionReleasingSavepoint(IFbLogger log, FbTransaction tr
210211

211212
var sb = new StringBuilder();
212213
sb.AppendLine("Releasing savepoint:");
213-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
214+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
214215
log.Debug(sb.ToString());
215216
}
216217
public static void TransactionReleasedSavepoint(IFbLogger log, FbTransaction transaction)
@@ -220,7 +221,7 @@ public static void TransactionReleasedSavepoint(IFbLogger log, FbTransaction tra
220221

221222
var sb = new StringBuilder();
222223
sb.AppendLine("Released savepoint:");
223-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
224+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
224225
log.Debug(sb.ToString());
225226
}
226227
public static void TransactionRollingBackSavepoint(IFbLogger log, FbTransaction transaction)
@@ -230,7 +231,7 @@ public static void TransactionRollingBackSavepoint(IFbLogger log, FbTransaction
230231

231232
var sb = new StringBuilder();
232233
sb.AppendLine("Rolling back savepoint:");
233-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
234+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
234235
log.Debug(sb.ToString());
235236
}
236237
public static void TransactionRolledBackSavepoint(IFbLogger log, FbTransaction transaction)
@@ -240,7 +241,7 @@ public static void TransactionRolledBackSavepoint(IFbLogger log, FbTransaction t
240241

241242
var sb = new StringBuilder();
242243
sb.AppendLine("Rolled back savepoint:");
243-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
244+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
244245
log.Debug(sb.ToString());
245246
}
246247
public static void TransactionCommittingRetaining(IFbLogger log, FbTransaction transaction)
@@ -250,7 +251,7 @@ public static void TransactionCommittingRetaining(IFbLogger log, FbTransaction t
250251

251252
var sb = new StringBuilder();
252253
sb.AppendLine("Committing (retaining) transaction:");
253-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
254+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
254255
log.Debug(sb.ToString());
255256
}
256257
public static void TransactionCommittedRetaining(IFbLogger log, FbTransaction transaction)
@@ -260,7 +261,7 @@ public static void TransactionCommittedRetaining(IFbLogger log, FbTransaction tr
260261

261262
var sb = new StringBuilder();
262263
sb.AppendLine("Committed (retaining) transaction:");
263-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
264+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
264265
log.Debug(sb.ToString());
265266
}
266267
public static void TransactionRollingBackRetaining(IFbLogger log, FbTransaction transaction)
@@ -270,7 +271,7 @@ public static void TransactionRollingBackRetaining(IFbLogger log, FbTransaction
270271

271272
var sb = new StringBuilder();
272273
sb.AppendLine("Rolling back (retaining) transaction:");
273-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
274+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
274275
log.Debug(sb.ToString());
275276
}
276277
public static void TransactionRolledBackRetaining(IFbLogger log, FbTransaction transaction)
@@ -280,7 +281,7 @@ public static void TransactionRolledBackRetaining(IFbLogger log, FbTransaction t
280281

281282
var sb = new StringBuilder();
282283
sb.AppendLine("Rolled back (retaining) transaction:");
283-
sb.AppendLine($"Transaction Handle: {transaction.Transaction.Handle}");
284+
sb.AppendLine($"Isolation Level: {transaction.IsolationLevel}");
284285
log.Debug(sb.ToString());
285286
}
286287

0 commit comments

Comments
 (0)