Fix for bug 282:

- Adding Ice.Default.CollocationOptimization property, default = 1
- Changing the ice_default proxy method to return a proxy having the
    default collocation optimization setting, rather than false
- Changing all other calls to ReferenceFactory::create to use the default
    setting instead of a hard-coded value

1 files changed, 3 insertions, 0 deletions

diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp
index 22b10db223c..96ecd323a3b 100644
--- a/cpp/src/Ice/DefaultsAndOverrides.cpp
+++ b/cpp/src/Ice/DefaultsAndOverrides.cpp
@@ -60,4 +60,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
     }
 
     const_cast<string&>(defaultLocator) = properties->getProperty("Ice.Default.Locator");
+
+    const_cast<bool&>(defaultCollocationOptimization) =
+	properties->getPropertyAsIntWithDefault("Ice.Default.CollocationOptimization", 1) > 0;
 }