diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-10-17 01:51:14 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-10-17 01:51:14 +0000 |
| commit | 2a9ee625c5ec8d1a41f09cd0da08a4444e72bc40 (patch) | |
| tree | e986dcc0911218def7a5d472e4b32ab2ec852596 /cpp/src/Ice/Instance.cpp | |
| parent | New menu items for grand parents, and table/parameter/list dialogs are not (diff) | |
| download | ice-2a9ee625c5ec8d1a41f09cd0da08a4444e72bc40.tar.bz2 ice-2a9ee625c5ec8d1a41f09cd0da08a4444e72bc40.tar.xz ice-2a9ee625c5ec8d1a41f09cd0da08a4444e72bc40.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=515
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 112fbd74cc8..b7ee0a20fbf 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -590,26 +590,11 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope } } - { - Int clientACMDefault = 60; // Client ACM enabled by default. - Int serverACMDefault = 0; // Server ACM disabled by default. - - // - // Legacy: If Ice.ConnectionIdleTime is set, we use it as - // default value for both the client- and server-side ACM. - // - if(!_properties->getProperty("Ice.ConnectionIdleTime").empty()) - { - Int num = _properties->getPropertyAsInt("Ice.ConnectionIdleTime"); - clientACMDefault = num; - serverACMDefault = num; - } - - const_cast<Int&>(_clientACM) = _properties->getPropertyAsIntWithDefault("Ice.ACM.Client", - clientACMDefault); - const_cast<Int&>(_serverACM) = _properties->getPropertyAsIntWithDefault("Ice.ACM.Server", - serverACMDefault); - } + // + // Client ACM enabled by default. Server ACM disabled by default. + // + const_cast<Int&>(_clientACM) = _properties->getPropertyAsIntWithDefault("Ice.ACM.Client", 60); + const_cast<Int&>(_serverACM) = _properties->getPropertyAsInt("Ice.ACM.Server"); const_cast<bool&>(_threadPerConnection) = _properties->getPropertyAsInt("Ice.ThreadPerConnection") > 0; |