From 12d2c541faa3f6a4db3ba58e7f9c8f9c03f947e8 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Fri, 20 Oct 2006 14:11:37 +0000
Subject: Observer fixes

---
 cpp/src/IceGrid/ServerAdapterI.cpp | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'cpp/src/IceGrid/ServerAdapterI.cpp')

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)
-- 
cgit v1.2.3