1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index 45367e83300..325f9abe134 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -214,6 +214,14 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex,
         ex.ice_throw();
     }
 
+    //
+    // Don't retry invocation timeouts.
+    //
+    if(dynamic_cast<const InvocationTimeoutException*>(&ex))
+    {
+        ex.ice_throw();
+    }
+
     ++cnt;
     assert(cnt > 0);