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())
     {