diff options
Diffstat (limited to 'cppe/test/IceE/location/TestI.cpp')
| -rw-r--r-- | cppe/test/IceE/location/TestI.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cppe/test/IceE/location/TestI.cpp b/cppe/test/IceE/location/TestI.cpp index b6da40a70a3..438e42a7832 100644 --- a/cppe/test/IceE/location/TestI.cpp +++ b/cppe/test/IceE/location/TestI.cpp @@ -61,8 +61,8 @@ ServerManagerI::startServer(const Ice::Current&) adapter2->setLocator(Ice::LocatorPrx::uncheckedCast(locator)); Ice::ObjectPtr object = new TestI(adapter, adapter2, _registry); - _registry->addObject(adapter->add(object, Ice::stringToIdentity("test"))); - _registry->addObject(adapter->add(object, Ice::stringToIdentity("test2"))); + _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test"))); + _registry->addObject(adapter->add(object, serverCommunicator->stringToIdentity("test2"))); adapter->activate(); adapter2->activate(); @@ -94,7 +94,7 @@ TestI::TestI(const Ice::ObjectAdapterPtr& adapter, const ServerLocatorRegistryPtr& registry) : _adapter1(adapter), _adapter2(adapter2), _registry(registry) { - _registry->addObject(_adapter1->add(new HelloI(), Ice::stringToIdentity("hello"))); + _registry->addObject(_adapter1->add(new HelloI(), _adapter1->getCommunicator()->stringToIdentity("hello"))); } void @@ -106,19 +106,20 @@ TestI::shutdown(const Ice::Current&) HelloPrx TestI::getHello(const Ice::Current&) { - return HelloPrx::uncheckedCast(_adapter1->createIndirectProxy(Ice::stringToIdentity("hello"))); + return HelloPrx::uncheckedCast(_adapter1->createIndirectProxy( + _adapter1->getCommunicator()->stringToIdentity("hello"))); } HelloPrx TestI::getReplicatedHello(const Ice::Current&) { - return HelloPrx::uncheckedCast(_adapter1->createProxy(Ice::stringToIdentity("hello"))); + return HelloPrx::uncheckedCast(_adapter1->createProxy(_adapter1->getCommunicator()->stringToIdentity("hello"))); } void TestI::migrateHello(const Ice::Current&) { - const Ice::Identity id = Ice::stringToIdentity("hello"); + const Ice::Identity id = _adapter1->getCommunicator()->stringToIdentity("hello"); try { _registry->addObject(_adapter2->add(_adapter1->remove(id), id)); |