Fixed ICE-5985: Java background test failures

1 files changed, 26 insertions, 2 deletions

diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 5f0361ba1ba..ee9464c28a8 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -196,6 +196,15 @@ Outgoing::completed(const Ice::Exception& ex)
     _monitor.notify();
 }
 
+void
+Outgoing::retryException(const Ice::Exception&)
+{
+    Monitor<Mutex>::Lock sync(_monitor);
+    assert(_state <= StateInProgress);
+    _state = StateRetry;
+    _monitor.notify();
+}
+
 bool
 Outgoing::invoke()
 {
@@ -258,8 +267,12 @@ Outgoing::invoke()
                 {
                     Time now = Time::now(Time::Monotonic);
                     timedOut = now >= _invocationTimeoutDeadline;
-                    while((_state == StateInProgress || !_sent) && _state != StateFailed && !timedOut)
+                    while((_state == StateInProgress || !_sent) && _state != StateFailed && _state != StateRetry)
                     {
+                        if(timedOut)
+                        {
+                            break;
+                        }
                         _monitor.timedWait(_invocationTimeoutDeadline - now);
                             
                         if((_state == StateInProgress || !_sent) && _state != StateFailed)
@@ -271,7 +284,7 @@ Outgoing::invoke()
                 }
                 else
                 {
-                    while((_state == StateInProgress || !_sent) && _state != StateFailed)
+                    while((_state == StateInProgress || !_sent) && _state != StateFailed && _state != StateRetry)
                     {
                         _monitor.wait();
                     }
@@ -305,6 +318,11 @@ Outgoing::invoke()
             {
                 _exception->ice_throw();
             }
+            else if(_state == StateRetry)
+            {
+                _proxy->__setRequestHandler(_handler, 0); // Clear request handler and retry.
+                continue;
+            }
             else
             {
                 assert(_state != StateInProgress);
@@ -715,3 +733,9 @@ FlushBatch::completed(const Ice::Exception& ex)
     _exception.reset(ex.ice_clone());
     _monitor.notify();
 }
+
+void
+FlushBatch::retryException(const Ice::Exception& ex)
+{
+    completed(ex);
+}