Another fix for ICE-5751: retry test failure

1 files changed, 18 insertions, 5 deletions

diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index cce1086363d..1e466b51f23 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -325,15 +325,28 @@ Outgoing::invoke()
                 {
                     if(invocationTimeout > 0)
                     {
-                        Time deadline = _invocationTimeoutDeadline - Time::now(Time::Monotonic);
-                        if(deadline < interval)
+                        IceUtil::Time now = Time::now(Time::Monotonic);
+                        if(_invocationTimeoutDeadline > now)
                         {
-                            interval = deadline; 
+                            Time deadline = _invocationTimeoutDeadline - now;
+                            if(deadline < interval)
+                            {
+                                interval = deadline;
+                            }
+                            ThreadControl::sleep(interval);
+                            if(_invocationTimeoutDeadline > Time::now(Time::Monotonic))
+                            {
+                                _observer.retried();
+                            }
                         }
                     }
-                    ThreadControl::sleep(interval);
+                    else
+                    {
+                        ThreadControl::sleep(interval);
+                        _observer.retried();
+                    }
                 }
-                if(_invocationTimeoutDeadline == Time() || _invocationTimeoutDeadline > Time::now(Time::Monotonic))
+                else
                 {
                     _observer.retried();
                 }