diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-07 16:20:00 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-07 16:20:00 +0100 |
| commit | f68bda81245047d672879dbb90e55b4446ffa71b (patch) | |
| tree | 4334915e140af70af74f1d8b2a32eba6bf97f57f /java/src | |
| parent | Added missing RemoteObserverI.java file (diff) | |
| download | ice-f68bda81245047d672879dbb90e55b4446ffa71b.tar.bz2 ice-f68bda81245047d672879dbb90e55b4446ffa71b.tar.xz ice-f68bda81245047d672879dbb90e55b4446ffa71b.zip | |
Fixed ICE-5150: assert in OutgoingAsync._finished, fixed CHANGES
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceInternal/OutgoingAsync.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java index e1e9beee974..b2b66a3be88 100644 --- a/java/src/IceInternal/OutgoingAsync.java +++ b/java/src/IceInternal/OutgoingAsync.java @@ -241,8 +241,10 @@ public class OutgoingAsync extends Ice.AsyncResult implements OutgoingAsyncMessa _timerTask = null; } - assert _is == null; - _is = new IceInternal.BasicStream(_instance, IceInternal.Protocol.currentProtocolEncoding); + if(_is == null) // _is can already be initialized if the invocation is retried + { + _is = new IceInternal.BasicStream(_instance, IceInternal.Protocol.currentProtocolEncoding); + } _is.swap(is); replyStatus = _is.readByte(); |