diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-10-13 13:49:34 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-10-13 13:49:34 +0200 |
| commit | 50b781e9afffd5f2df09efb0a414c877afc74e95 (patch) | |
| tree | f81ee8f7738dba72fc54edf636eeabbb5deb47b7 /cpp/src/Ice/DefaultsAndOverrides.cpp | |
| parent | Fixed bug 4266 - stringified proxy issues, other minor issues (diff) | |
| download | ice-50b781e9afffd5f2df09efb0a414c877afc74e95.tar.bz2 ice-50b781e9afffd5f2df09efb0a414c877afc74e95.tar.xz ice-50b781e9afffd5f2df09efb0a414c877afc74e95.zip | |
Fixed bug 860 - close timeouts
Diffstat (limited to 'cpp/src/Ice/DefaultsAndOverrides.cpp')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index b14686121da..81572b0ec68 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -23,6 +23,8 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro overrideTimeoutValue(-1), overrideConnectTimeout(false), overrideConnectTimeoutValue(-1), + overrideCloseTimeout(false), + overrideCloseTimeoutValue(-1), overrideCompress(false), overrideCompressValue(false), overrideSecure(false), @@ -48,6 +50,13 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("Ice.Override.ConnectTimeout"); } + value = properties->getProperty("Ice.Override.CloseTimeout"); + if(!value.empty()) + { + const_cast<bool&>(overrideCloseTimeout) = true; + const_cast<Int&>(overrideCloseTimeoutValue) = properties->getPropertyAsInt("Ice.Override.CloseTimeout"); + } + value = properties->getProperty("Ice.Override.Compress"); if(!value.empty()) { |