summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/Glacier2Router.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/Glacier2/Glacier2Router.cpp b/cpp/src/Glacier2/Glacier2Router.cpp
index ab322df495d..b9361e21052 100644
--- a/cpp/src/Glacier2/Glacier2Router.cpp
+++ b/cpp/src/Glacier2/Glacier2Router.cpp
@@ -277,12 +277,13 @@ Glacier2::RouterService::initializeCommunicator(int& argc, char* argv[])
// No active connection management is permitted with
// Glacier2. Connections must remain established.
//
- defaultProperties->setProperty("Ice.ConnectionIdleTime", "0");
+ defaultProperties->setProperty("Ice.ACM.Client", "0");
+ defaultProperties->setProperty("Ice.ACM.Server", "0");
//
- // Ice.MonitorConnections defaults to Ice.ConnectionIdleTime,
- // which we set to 0 above. However, we still want the
- // connection monitor thread for AMI timeouts. We only set
+ // Ice.MonitorConnections defaults to the smaller of Ice.ACM.Client
+ // or Ice.ACM.Server, which we set to 0 above. However, we still want
+ // the connection monitor thread for AMI timeouts. We only set
// this value if it hasn't been set explicitly already.
//
if(defaultProperties->getProperty("Ice.MonitorConnections").empty())