summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/src/IceInternal/Instance.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 1ee242ba63c..9e8e0d9e612 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -789,7 +789,9 @@ public final class Instance
}
//
- // Start connection monitor if necessary.
+ // Start connection monitor if necessary. Set the check interval to
+ // 1/10 of the ACM timeout with a minmal value of 1 second and a
+ // maximum value of 5 minutes.
//
int interval = 0;
if(_clientACM > 0 && _serverACM > 0)
@@ -811,6 +813,10 @@ public final class Instance
{
interval = _serverACM;
}
+ if(interval > 0)
+ {
+ interval = java.lang.Math.min(300, java.lang.Math.max(1, (int)interval / 10));
+ }
interval = _initData.properties.getPropertyAsIntWithDefault("Ice.MonitorConnections", interval);
if(interval > 0)
{