diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-16 12:15:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-16 12:15:14 +0200 |
| commit | 1edb603754a8ab3922a3b9b8c69e0dd3614e0dab (patch) | |
| tree | d5d56c91a42187cbd68b0dcf65e95eab68cde22d /cpp/src/Ice/Incoming.cpp | |
| parent | ICE-4856 - Fix multicast for JDK 7 (diff) | |
| download | ice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.tar.bz2 ice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.tar.xz ice-1edb603754a8ab3922a3b9b8c69e0dd3614e0dab.zip | |
Fixed IceMX race condition, VC9 build
Diffstat (limited to 'cpp/src/Ice/Incoming.cpp')
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 962749a871f..04dc96a838b 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -218,10 +218,7 @@ IceInternal::IncomingBase::__servantLocatorFinished() { assert(_connection); - if(_observer) - { - _observer.userException(); - } + _observer.userException(); // // The operation may have already marshaled a reply; we must overwrite that reply. @@ -616,10 +613,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre { Ice::EncodingVersion encoding = _is->skipEncaps(); // Required for batch requests. - if(_observer) - { - _observer.userException(); - } + _observer.userException(); if(_response) { |