diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-10-20 13:24:19 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-10-20 13:24:19 +0000 |
| commit | 280c0231d0a4630a3327dca70d467613e6e97aea (patch) | |
| tree | e408728be00bcac1b06a6582e437602f8526c5af /cpp/src/IceGrid/NodeI.cpp | |
| parent | - Update required version of Mono to 1.1.8 in INSTALL.MONO file (diff) | |
| download | ice-280c0231d0a4630a3327dca70d467613e6e97aea.tar.bz2 ice-280c0231d0a4630a3327dca70d467613e6e97aea.tar.xz ice-280c0231d0a4630a3327dca70d467613e6e97aea.zip | |
Observer bug fixes.
Diffstat (limited to 'cpp/src/IceGrid/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index b08158e2fd0..0fbaea01cc5 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -456,7 +456,7 @@ NodeI::setSession(const NodeSessionPrx& session, const NodeObserverPrx& observer _observer = observer; } -void +int NodeI::keepAlive() { NodeSessionPrx session = getSession(); @@ -477,12 +477,13 @@ NodeI::keepAlive() { Ice::PropertiesPtr properties = getCommunicator()->getProperties(); const string instanceNameProperty = "IceGrid.InstanceName"; - string instanceName = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid"); - Ice::ObjectPrx obj = getCommunicator()->stringToProxy(instanceName + "/Registry@IceGrid.Registry.Internal"); + string instName = properties->getPropertyWithDefault(instanceNameProperty, "IceGrid"); + Ice::ObjectPrx obj = getCommunicator()->stringToProxy(instName + "/Registry@IceGrid.Registry.Internal"); RegistryPrx registry = RegistryPrx::uncheckedCast(obj); NodeObserverPrx observer; setSession(registry->registerNode(_name, _proxy, _platform.getNodeInfo(), observer), observer); checkConsistency(); + return registry->getTimeout() / 2; } catch(const NodeActiveException&) { @@ -495,6 +496,7 @@ NodeI::keepAlive() _traceLevels->logger->warning(os.str()); } } + return 0; } void |