1 files changed, 9 insertions, 0 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 8df552d9d20..fc4cf920a7f 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -110,6 +110,15 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
         throw ex;
     }
 
+    const_cast<int&>(defaultTimeout) =
+        properties->getPropertyAsIntWithDefault("Ice.Default.Timeout", 60000);
+    if(defaultTimeout < 1 && defaultTimeout != -1)
+    {
+        InitializationException ex(__FILE__, __LINE__);
+        ex.reason = "invalid value for Ice.Default.Timeout: `" + properties->getProperty("Ice.Default.Timeout") + "'";
+        throw ex;
+    }
+
     const_cast<int&>(defaultInvocationTimeout) =
         properties->getPropertyAsIntWithDefault("Ice.Default.InvocationTimeout", -1);