summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-12-22 19:31:20 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-12-22 19:31:20 +0100
commitc721e108d464120d1de94bdc29baf9d506141406 (patch)
tree97fa63afa1ee6ee9ccd7db178e9827bdc9b6b9db /java/src
parentFixed make install from config to install upgradeicegrid36.py (diff)
downloadice-c721e108d464120d1de94bdc29baf9d506141406.tar.bz2
ice-c721e108d464120d1de94bdc29baf9d506141406.tar.xz
ice-c721e108d464120d1de94bdc29baf9d506141406.zip
Fixed ICE-6211 - background test hang on Android
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java b/java/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java
index 3015a0d5664..95f45195c64 100644
--- a/java/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java
+++ b/java/src/Ice/src/main/java/IceInternal/ProxyOutgoingAsyncBase.java
@@ -71,8 +71,14 @@ public abstract class ProxyOutgoingAsyncBase extends OutgoingAsyncBase
{
try
{
+ //
+ // It's important to let the retry queue do the retry. This is
+ // called from the connect request handler and the retry might
+ // require could end up waiting for the flush of the
+ // connection to be done.
+ //
handleRetryException(ex);
- retry();
+ _instance.retryQueue().add(this, 0);
}
catch(Ice.Exception exc)
{