summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2017-02-02 12:33:17 -0800
committerMark Spruiell <mes@zeroc.com>2017-02-02 12:33:17 -0800
commitd652dd90a69826d92a13f88a173fa3dbd2e17b76 (patch)
tree768db00699525be54f1d314909a90268eefedb20 /java/src
parentReorder metrics on Server and Service (diff)
downloadice-d652dd90a69826d92a13f88a173fa3dbd2e17b76.tar.bz2
ice-d652dd90a69826d92a13f88a173fa3dbd2e17b76.tar.xz
ice-d652dd90a69826d92a13f88a173fa3dbd2e17b76.zip
Connection::close fixes for C#/Java/JS
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java
index 5fef6998469..321ac80e0b8 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ProxyFactory.java
@@ -185,11 +185,12 @@ public final class ProxyFactory
}
//
- // Don't retry if the communicator is destroyed or object adapter
- // deactivated.
+ // Don't retry if the communicator is destroyed, object adapter is deactivated,
+ // or connection is manually closed.
//
if(ex instanceof com.zeroc.Ice.CommunicatorDestroyedException ||
- ex instanceof com.zeroc.Ice.ObjectAdapterDeactivatedException)
+ ex instanceof com.zeroc.Ice.ObjectAdapterDeactivatedException ||
+ ex instanceof com.zeroc.Ice.ConnectionManuallyClosedException)
{
throw ex;
}