1 files changed, 9 insertions, 0 deletions
diff --git a/java/src/IceInternal/ProxyFactory.java b/java/src/IceInternal/ProxyFactory.java
index 59fc8028e34..fb664c89b9b 100644
--- a/java/src/IceInternal/ProxyFactory.java
+++ b/java/src/IceInternal/ProxyFactory.java
@@ -206,6 +206,15 @@ public final class ProxyFactory
         }
 
         //
+        // Don't retry if the communicator is destroyed or object adapter
+        // deactivated.
+        //
+        if(ex instanceof Ice.CommunicatorDestroyedException || ex instanceof Ice.ObjectAdapterDeactivatedException)
+        {
+            throw ex;
+        }
+
+        //
         // Don't retry invocation timeouts.
         //
         if(ex instanceof Ice.InvocationTimeoutException)