summaryrefslogtreecommitdiff
path: root/java-compat
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-compat
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-compat')
-rw-r--r--java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java
index 43fd22d3030..88e23f4621a 100644
--- a/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java
+++ b/java-compat/src/Ice/src/main/java/IceInternal/ProxyFactory.java
@@ -187,10 +187,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 Ice.CommunicatorDestroyedException || ex instanceof Ice.ObjectAdapterDeactivatedException)
+ if(ex instanceof Ice.CommunicatorDestroyedException ||
+ ex instanceof Ice.ObjectAdapterDeactivatedException ||
+ ex instanceof Ice.ConnectionManuallyClosedException)
{
throw ex;
}