diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-12-03 09:46:16 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-12-03 09:46:16 +0100 |
| commit | 010563f675eaae657618b57ba87008dba9de868a (patch) | |
| tree | b800c3cc1739fca990f0bb3358c7ee409078dc11 /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | Fixed ICE-5069 - demopy/IceGrid/simple failure (diff) | |
| download | ice-010563f675eaae657618b57ba87008dba9de868a.tar.bz2 ice-010563f675eaae657618b57ba87008dba9de868a.tar.xz ice-010563f675eaae657618b57ba87008dba9de868a.zip | |
Fixed ICE-5078 - sent callback called from wrong thread
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 33ac9dee0f5..eee5b3215c2 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -1114,13 +1114,12 @@ IceInternal::CommunicatorBatchOutgoingAsync::check(bool userThread) // // _sentSynchronously is immutable here. // - if(!_sentSynchronously && userThread) + if(!_sentSynchronously || !userThread) { __sentAsync(); } else { - assert(_sentSynchronously == userThread); // sentSynchronously && !userThread is impossible. AsyncResult::__sent(); } } |