1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index ef9719dbc99..815bebb5a9a 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -26,6 +26,8 @@ void IceInternal::decRef(DefaultsAndOverrides* p) { p->__decRef(); }
 IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& properties) :
     overrideTimeout(false),
     overrideTimeoutValue(-1),
+    overrideConnectTimeout(false),
+    overrideConnectTimeoutValue(-1),
     overrideCompress(false),
     overrideCompressValue(false)
 {
@@ -48,6 +50,13 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
 	const_cast<Int&>(overrideTimeoutValue) = properties->getPropertyAsInt("Ice.Override.Timeout");
     }
 
+    value = properties->getProperty("Ice.Override.ConnectTimeout");
+    if(!value.empty())
+    {
+	const_cast<bool&>(overrideConnectTimeout) = true;
+	const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("Ice.Override.ConnectTimeout");
+    }
+
     value = properties->getProperty("Ice.Override.Compress");
     if(!value.empty())
     {