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, 7 insertions, 2 deletions

diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index ec0d57cc1ac..79a947e6a02 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -27,6 +27,7 @@
 #include <Ice/ThreadPool.h>
 #include <Ice/Communicator.h>
 #include <Ice/Router.h>
+#include <Ice/DefaultsAndOverrides.h>
 
 #ifdef _WIN32
 #   include <sys/timeb.h>
@@ -802,7 +803,9 @@ Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
 	//
 	ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), facet,
 								 Reference::ModeTwoway, false, _id,
-								 0, _locatorInfo, true);
+								 0, _locatorInfo,
+								 _instance->defaultsAndOverrides()->
+								 defaultCollocationOptimization);
 
 	//
 	// Return a proxy for the reference. 
@@ -841,7 +844,9 @@ Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet)
     // Create a reference and return a proxy for this reference.
     //
     ReferencePtr ref = _instance->referenceFactory()->create(ident, _instance->getDefaultContext(), facet,
-							     Reference::ModeTwoway, false, endpoints, 0, true);
+							     Reference::ModeTwoway, false, endpoints, 0,
+							     _instance->defaultsAndOverrides()->
+							     defaultCollocationOptimization);
     return _instance->proxyFactory()->referenceToProxy(ref);
 
 }