summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2005-04-07 16:31:45 +0000
committerMarc Laukien <marc@zeroc.com>2005-04-07 16:31:45 +0000
commit45f1c442774c7e85fae2d82bea2c420034865810 (patch)
treeee78e35b1178bc594ccb68f88d26e058568e1ff2 /cpp/src/Ice/ConnectionI.cpp
parentminor edits (diff)
downloadice-45f1c442774c7e85fae2d82bea2c420034865810.tar.bz2
ice-45f1c442774c7e85fae2d82bea2c420034865810.tar.xz
ice-45f1c442774c7e85fae2d82bea2c420034865810.zip
Ice.ACM.Client, Ice.ACM.Server
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 34047945c65..b6b775e0d96 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1401,11 +1401,11 @@ Ice::ConnectionI::ConnectionI(const InstancePtr& instance,
{
if(_adapter)
{
- acmTimeout = _instance->serverConnectionIdleTime();
+ acmTimeout = _instance->serverACM();
}
else
{
- acmTimeout = _instance->clientConnectionIdleTime();
+ acmTimeout = _instance->clientACM();
}
}