diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-11-19 17:49:00 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-11-19 17:49:00 -0500 |
| commit | 99bbf0fbbb8ee4fe2b5807c68c4a7b054e29f3db (patch) | |
| tree | 1629e081bdbf6cfd412b36f19b1eb5f1f0face2b /cpp/src/Freeze/TransactionI.cpp | |
| parent | Fixed bug #2562 (diff) | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-99bbf0fbbb8ee4fe2b5807c68c4a7b054e29f3db.tar.bz2 ice-99bbf0fbbb8ee4fe2b5807c68c4a7b054e29f3db.tar.xz ice-99bbf0fbbb8ee4fe2b5807c68c4a7b054e29f3db.zip | |
Merge branch 'master' of cvs:/home/git/ice
Diffstat (limited to 'cpp/src/Freeze/TransactionI.cpp')
| -rw-r--r-- | cpp/src/Freeze/TransactionI.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/Freeze/TransactionI.cpp b/cpp/src/Freeze/TransactionI.cpp index 725953a4c6c..e8f1bdb2932 100644 --- a/cpp/src/Freeze/TransactionI.cpp +++ b/cpp/src/Freeze/TransactionI.cpp @@ -137,10 +137,12 @@ Freeze::TransactionI::rollbackInternal(bool warning) out << "failed to rollback transaction " << hex << txnId << dec << ": " << dx.what(); } + DeadlockException deadlockException(__FILE__, __LINE__, dx.what(), this); + postCompletion(false, true); // After postCompletion is called the transaction may be // dead. Beware! - throw DeadlockException(__FILE__, __LINE__, dx.what()); + throw deadlockException; } catch(const ::DbException& dx) { |