diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2011-04-12 12:12:55 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2011-04-12 12:12:55 +0200 |
| commit | 1d4c8cf9f9a75394da3c0383fbcd787e2545a58c (patch) | |
| tree | 0b50055f2506b099752b13ffb48a18f6d7fb5454 /cpp/src/Ice/ConnectionI.cpp | |
| parent | Updated MSDN menu names for SDK (diff) | |
| download | ice-1d4c8cf9f9a75394da3c0383fbcd787e2545a58c.tar.bz2 ice-1d4c8cf9f9a75394da3c0383fbcd787e2545a58c.tar.xz ice-1d4c8cf9f9a75394da3c0383fbcd787e2545a58c.zip | |
Fixed bug 4993 & 5001, addition fix for bug 4914
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index e90848d7b1e..722c6a6c81b 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1487,7 +1487,18 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingAsyn IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); if(--_dispatchCount == 0) { - if(_state == StateFinished) + if(_state == StateClosing) + { + try + { + initiateShutdown(); + } + catch(const LocalException& ex) + { + setState(StateClosed, ex); + } + } + else if(_state == StateFinished) { _reaper->add(this); } |