diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-16 17:06:33 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-16 17:06:33 +0200 |
| commit | 7ecc2560f73d8914f7de6c59b8777271719150d7 (patch) | |
| tree | 02390e1792305effc1d56810275b4e21e00c5a02 /cpp/src/IceBridge/IceBridge.cpp | |
| parent | Fixed ICE-7872 - Objective-C Ice/timeout test failure (diff) | |
| download | ice-7ecc2560f73d8914f7de6c59b8777271719150d7.tar.bz2 ice-7ecc2560f73d8914f7de6c59b8777271719150d7.tar.xz ice-7ecc2560f73d8914f7de6c59b8777271719150d7.zip | |
Fixed ICE-7882 - replaced IceBridge.Router with IceBridge.InstanceName
Diffstat (limited to 'cpp/src/IceBridge/IceBridge.cpp')
| -rw-r--r-- | cpp/src/IceBridge/IceBridge.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/IceBridge/IceBridge.cpp b/cpp/src/IceBridge/IceBridge.cpp index bb9c105015a..3e96507d0ea 100644 --- a/cpp/src/IceBridge/IceBridge.cpp +++ b/cpp/src/IceBridge/IceBridge.cpp @@ -682,11 +682,9 @@ BridgeService::start(int argc, char* argv[], int& status) adapter->addDefaultServant(new BridgeI(adapter, target), ""); - if(properties->getPropertyAsIntWithDefault("IceBridge.Router", 0) > 0) - { - RouterPrx router = RouterPrx::uncheckedCast(adapter->add(new RouterI, stringToIdentity("IceBridge/router"))); - adapter->add(new FinderI(router), stringToIdentity("Ice/RouterFinder")); - } + string instanceName = properties->getPropertyWithDefault("IceBridge.InstanceName", "IceBridge"); + RouterPrx router = RouterPrx::uncheckedCast(adapter->add(new RouterI, stringToIdentity(instanceName + "/router"))); + adapter->add(new FinderI(router), stringToIdentity("Ice/RouterFinder")); try { |