From 93a4343980b792422c09ce0a8b9a13360ffeb211 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Thu, 25 Sep 2008 19:48:12 +0200
Subject: Fixed potential IceGrid node hang on shutdown

---
 cpp/src/IceGrid/ServerAdapterI.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/cpp/src/IceGrid/ServerAdapterI.cpp b/cpp/src/IceGrid/ServerAdapterI.cpp
index ba904bdf199..08ae0d9a441 100644
--- a/cpp/src/IceGrid/ServerAdapterI.cpp
+++ b/cpp/src/IceGrid/ServerAdapterI.cpp
@@ -96,6 +96,12 @@ ServerAdapterI::activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Cur
         destroy();
         activationFailed("server destroyed");
     }
+    catch(const Ice::Exception& ex)
+    {
+        ostringstream os;
+        os << "unexpected exception: " << ex;
+        activationFailed(os.str());
+    }
 }
 
 Ice::ObjectPrx
@@ -188,7 +194,14 @@ ServerAdapterI::setDirectProxy(const Ice::ObjectPrx& prx, const Ice::Current&)
 void
 ServerAdapterI::destroy()
 {
-    _node->getAdapter()->remove(_this->ice_getIdentity());
+    try
+    {
+        _node->getAdapter()->remove(_this->ice_getIdentity());
+    }
+    catch(const Ice::LocalException&)
+    {
+        // Ignore.
+    }
 }
 
 void
-- 
cgit v1.2.3