diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-15 17:26:45 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-15 17:26:45 +0200 |
| commit | f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2 (patch) | |
| tree | 6b12ef2c59421702743048393f4757c0d1e0c504 /java/src/IceInternal/RetryTask.java | |
| parent | ICE-5732 missing tracing in throughput demo (diff) | |
| download | ice-f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2.tar.bz2 ice-f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2.tar.xz ice-f94eb5f938d33dc2ce9b09b03b5dc6ccf7bd46c2.zip | |
Fixed ICE-5666: setting the invocation timeout to -2 provides the previous connection timeouts
Diffstat (limited to 'java/src/IceInternal/RetryTask.java')
| -rw-r--r-- | java/src/IceInternal/RetryTask.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/java/src/IceInternal/RetryTask.java b/java/src/IceInternal/RetryTask.java index 974dc998a79..b847dc69f33 100644 --- a/java/src/IceInternal/RetryTask.java +++ b/java/src/IceInternal/RetryTask.java @@ -36,12 +36,10 @@ class RetryTask implements Runnable, CancellationHandler { if(_queue.remove(this) && _future.cancel(false)) { - // - // We just retry the outgoing async now rather than marking it - // as finished. The retry will check for the cancellation - // exception and terminate appropriately the request. - // - _outAsync.retry(); + if(_outAsync.completed(ex)) + { + _outAsync.invokeCompletedAsync(); + } } } |