summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ProxyFactory.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-09-25 12:24:57 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-09-25 12:24:57 +0200
commit356e14707a342da8102b731503c8f2628c1cc79b (patch)
treeb15b837cad964f6ab3a66670ac6eb89a1d832677 /java/src/IceInternal/ProxyFactory.java
parentFixed compilation problem with Ruby on OS X (diff)
downloadice-356e14707a342da8102b731503c8f2628c1cc79b.tar.bz2
ice-356e14707a342da8102b731503c8f2628c1cc79b.tar.xz
ice-356e14707a342da8102b731503c8f2628c1cc79b.zip
Fixed ICE-5687 - adapterDeactivation test warnings
Diffstat (limited to 'java/src/IceInternal/ProxyFactory.java')
-rw-r--r--java/src/IceInternal/ProxyFactory.java9
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)