summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerAdapterI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-10-20 14:11:37 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-10-20 14:11:37 +0000
commit12d2c541faa3f6a4db3ba58e7f9c8f9c03f947e8 (patch)
tree342dbb435f37e4f64fd1c515fc14fa17cf0e4639 /cpp/src/IceGrid/ServerAdapterI.cpp
parentFix (diff)
downloadice-12d2c541faa3f6a4db3ba58e7f9c8f9c03f947e8.tar.bz2
ice-12d2c541faa3f6a4db3ba58e7f9c8f9c03f947e8.tar.xz
ice-12d2c541faa3f6a4db3ba58e7f9c8f9c03f947e8.zip
Observer fixes
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerAdapterI.cpp21
1 files changed, 4 insertions, 17 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp
index d00f721cdd9..eef9228ec94 100644
--- a/cpp/src/IceGrid/ServerAdapterI.cpp
+++ b/cpp/src/IceGrid/ServerAdapterI.cpp
@@ -139,23 +139,10 @@ ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current&)
if(updated)
{
- NodeObserverPrx observer = _node->getObserver();
- if(observer)
- {
- AdapterDynamicInfo info;
- info.id = _id;
- info.proxy = _proxy;
- try
- {
- observer->updateAdapter(_node->getName(), info);
- }
- catch(const Ice::LocalException&)
- {
- //
- // Expected if the master IceGrid registry is down.
- //
- }
- }
+ AdapterDynamicInfo info;
+ info.id = _id;
+ info.proxy = _proxy;
+ _node->observerUpdateAdapter(info);
}
if(_proxy)