summaryrefslogtreecommitdiff
path: root/cpp/src/IcePack/AdapterRegistryI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2002-12-07 22:47:29 +0000
committerBenoit Foucher <benoit@zeroc.com>2002-12-07 22:47:29 +0000
commit8db809366b6cb938f52550c427cc73d9d46b79bc (patch)
treeb6f095b076b4b9cbaccb4abf5a981fc133e1f945 /cpp/src/IcePack/AdapterRegistryI.cpp
parentmore AMD exception fixes (diff)
downloadice-8db809366b6cb938f52550c427cc73d9d46b79bc.tar.bz2
ice-8db809366b6cb938f52550c427cc73d9d46b79bc.tar.xz
ice-8db809366b6cb938f52550c427cc73d9d46b79bc.zip
Changed the IcePack locator implementation to use AMD and AMI (only when
the invocation might take time, for instance while the registry waits for the node to activate a server). Added IcePack registry configuration to the hello world demo.
Diffstat (limited to 'cpp/src/IcePack/AdapterRegistryI.cpp')
-rw-r--r--cpp/src/IcePack/AdapterRegistryI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IcePack/AdapterRegistryI.cpp b/cpp/src/IcePack/AdapterRegistryI.cpp
index d0647d7cfe4..a25d7f6d3ba 100644
--- a/cpp/src/IcePack/AdapterRegistryI.cpp
+++ b/cpp/src/IcePack/AdapterRegistryI.cpp
@@ -86,7 +86,7 @@ IcePack::AdapterRegistryI::findById(const string& id, const Ice::Current&)
{
try
{
- return AdapterPrx::checkedCast(p->second);
+ return AdapterPrx::checkedCast(p->second->ice_collocationOptimization(false));
}
catch(const Ice::ObjectNotExistException&)
{
@@ -94,7 +94,7 @@ IcePack::AdapterRegistryI::findById(const string& id, const Ice::Current&)
}
catch(const Ice::LocalException&)
{
- return AdapterPrx::uncheckedCast(p->second);
+ return AdapterPrx::uncheckedCast(p->second->ice_collocationOptimization(false));
}
}
throw AdapterNotExistException();