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 /java/src/IceInternal/CommunicatorBatchOutgoingAsync.java | |
| 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 'java/src/IceInternal/CommunicatorBatchOutgoingAsync.java')
| -rw-r--r-- | java/src/IceInternal/CommunicatorBatchOutgoingAsync.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/IceInternal/CommunicatorBatchOutgoingAsync.java b/java/src/IceInternal/CommunicatorBatchOutgoingAsync.java index a2c9514ebdd..361cd748fec 100644 --- a/java/src/IceInternal/CommunicatorBatchOutgoingAsync.java +++ b/java/src/IceInternal/CommunicatorBatchOutgoingAsync.java @@ -126,13 +126,12 @@ public class CommunicatorBatchOutgoingAsync extends Ice.AsyncResult // // sentSynchronously_ is immutable here. // - if(!_sentSynchronously && userThread) + if(!_sentSynchronously || !userThread) { __sentAsync(); } else { - assert(_sentSynchronously == userThread); // sentSynchronously && !userThread is impossible. __sentInternal(); } } |