diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
| commit | a4f93259dc3494d98addf38e69b87eb557d432b3 (patch) | |
| tree | d2b78bb5cea24e33dc1b46be22dba6167e96c9ed /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | Fix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff) | |
| download | ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2 ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip | |
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 9044a6d6de3..183de011e10 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -467,7 +467,6 @@ NodeService::startImpl(int argc, char* argv[], int& status) try { Ice::ObjectPrx object = _adapter->addWithUUID(new FileUserAccountMapperI(userAccountFileProperty)); - object = object->ice_collocationOptimized(true); mapper = UserAccountMapperPrx::uncheckedCast(object); } catch(const std::string& msg) @@ -797,11 +796,6 @@ NodeService::initializeCommunicator(int& argc, char* argv[], initData.properties = createProperties(argc, argv, initData.properties); // - // Make sure that IceGridNode doesn't use collocation optimization - // - initData.properties->setProperty("Ice.Default.CollocationOptimized", "0"); - - // // Delay creation of Admin object: // initData.properties->setProperty("Ice.Admin.DelayCreation", "1"); |