diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-04-05 12:54:15 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-04-05 12:54:15 +0000 |
| commit | 872fd9e5dfb743a648c64bf774f6c9a76a45b651 (patch) | |
| tree | c071c5dc5bd1177c0913e82cb8a3233f0da50ea6 /cpp/src/IceGrid/LocatorI.cpp | |
| parent | adding timeout test (diff) | |
| download | ice-872fd9e5dfb743a648c64bf774f6c9a76a45b651.tar.bz2 ice-872fd9e5dfb743a648c64bf774f6c9a76a45b651.tar.xz ice-872fd9e5dfb743a648c64bf774f6c9a76a45b651.zip | |
- Added support for observing adapters and objects.
- Lots of cleanup in the IceGrid registry initilization method.
Diffstat (limited to 'cpp/src/IceGrid/LocatorI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/LocatorI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp index 0284e0a95e7..84f7c002803 100644 --- a/cpp/src/IceGrid/LocatorI.cpp +++ b/cpp/src/IceGrid/LocatorI.cpp @@ -286,7 +286,7 @@ LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator, const Ice::LocatorRegistryPrx& locatorRegistry) : _communicator(communicator), _database(database), - _locatorRegistry(locatorRegistry) + _locatorRegistry(Ice::LocatorRegistryPrx::uncheckedCast(locatorRegistry->ice_collocationOptimization(false))) { } @@ -396,7 +396,7 @@ LocatorI::getDirectProxyException(const AdapterPrx& adapter, const string& id, c return; } } - catch(const Ice::Exception&) + catch(const Ice::Exception& ex) { // // TODO: Add a warning!!! |