diff options
| author | Michi Henning <michi@zeroc.com> | 2007-09-19 11:22:45 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-09-19 11:22:45 +1000 |
| commit | cd0338e842b7751c423f5384d247202d3c981be4 (patch) | |
| tree | 2b2965f974c3f7f0dda3b94ed4d7c1c49175d375 /cpp/src/Freeze/TransactionI.cpp | |
| parent | Added more tests. Changed stack marshaling to reverse order during (diff) | |
| parent | Added missing facet (diff) | |
| download | ice-cd0338e842b7751c423f5384d247202d3c981be4.tar.bz2 ice-cd0338e842b7751c423f5384d247202d3c981be4.tar.xz ice-cd0338e842b7751c423f5384d247202d3c981be4.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Conflicts:
cs/src/Ice/Instance.cs
Removed conflicts. Added more tests. Changed stack
marshaling to reverse order during marshaling instead
of during unmarshaling.
Diffstat (limited to 'cpp/src/Freeze/TransactionI.cpp')
| -rw-r--r-- | cpp/src/Freeze/TransactionI.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/Freeze/TransactionI.cpp b/cpp/src/Freeze/TransactionI.cpp index a11c0eb44c4..725953a4c6c 100644 --- a/cpp/src/Freeze/TransactionI.cpp +++ b/cpp/src/Freeze/TransactionI.cpp @@ -273,5 +273,6 @@ Freeze::TransactionI::postCompletion(bool committed, bool deadlock) ConnectionIPtr connection = _connection; _connection = 0; + connection->clearTransaction(); // may release the last _refCount } |