diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-09-19 13:20:52 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-09-19 13:20:52 -0230 |
| commit | b879442440d9e1c31f0b3d9e1ac2bd57a1e52d2f (patch) | |
| tree | fb3c36b7a1f421de583b9f5235f92671916ce265 /cpp/src/IceGrid/Client.cpp | |
| parent | Fixed Windows C# build (diff) | |
| download | ice-b879442440d9e1c31f0b3d9e1ac2bd57a1e52d2f.tar.bz2 ice-b879442440d9e1c31f0b3d9e1ac2bd57a1e52d2f.tar.xz ice-b879442440d9e1c31f0b3d9e1ac2bd57a1e52d2f.zip | |
ICE-5660 Colloc-only object adapters
Diffstat (limited to 'cpp/src/IceGrid/Client.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Client.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index c629a0c91cc..6ff2d21547b 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -573,7 +573,7 @@ Client::run(StringSeq& originalArgs) } lookupEndpoints = os.str(); } - + ObjectPrx prx = communicator()->stringToProxy("IceGrid/Lookup -d:" + lookupEndpoints); LookupPrx lookupPrx = LookupPrx::uncheckedCast(prx->ice_collocationOptimized(false)); @@ -822,9 +822,7 @@ Client::run(StringSeq& originalArgs) // if(registry->ice_getIdentity() == localRegistry->ice_getIdentity()) { - properties->setProperty("CollocInternal.AdapterId", IceUtil::generateUUID()); - ObjectAdapterPtr colloc = communicator()->createObjectAdapter("CollocInternal"); - colloc->setLocator(0); + ObjectAdapterPtr colloc = communicator()->createObjectAdapter(""); // colloc-only adapter ObjectPrx router = colloc->addWithUUID(new ReuseConnectionRouter(locator)); communicator()->setDefaultRouter(RouterPrx::uncheckedCast(router)); registry = registry->ice_router(communicator()->getDefaultRouter()); |