diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 25 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 |
3 files changed, 7 insertions, 23 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; diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 60ae9aa7b04..589c5ceb4bd 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Fri Oct 14 09:51:50 2005 +// Generated by makeprops.py from file `../../config/PropertyNames.def', Mon Oct 17 10:26:46 2005 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -20,7 +20,6 @@ const char* IceInternal::PropertyNames::IceProps[] = "Ice.ChangeUser", "Ice.Compression.Level", "Ice.Config", - "Ice.ConnectionIdleTime", "Ice.Default.CollocationOptimization", "Ice.Default.Host", "Ice.Default.Locator", diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index e9a53a60e44..8ad8aa23afb 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -7,7 +7,7 @@ // // ********************************************************************** -// Generated by makeprops.py from file `../config/PropertyNames.def', Fri Oct 14 09:51:50 2005 +// Generated by makeprops.py from file `../../config/PropertyNames.def', Mon Oct 17 10:26:46 2005 // IMPORTANT: Do not edit this file -- any edits made here will be lost! |