From a3c9dfeead519e87ba197e5e66b1013f39fa4366 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Fri, 26 Sep 2008 14:04:54 +0200
Subject: IceGrid fixes to ensure the registry/node don't wait too long if a
 replica becomes unreachable

---
 cpp/src/IceGrid/Allocatable.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/cpp/src/IceGrid/Allocatable.cpp b/cpp/src/IceGrid/Allocatable.cpp
index e078564d5a5..666d7c84cb7 100644
--- a/cpp/src/IceGrid/Allocatable.cpp
+++ b/cpp/src/IceGrid/Allocatable.cpp
@@ -38,7 +38,14 @@ AllocationRequest::pending()
 
     if(_timeout > 0)
     {
-        _session->getTimer()->schedule(this, IceUtil::Time::milliSeconds(_timeout));
+        try
+        {
+            _session->getTimer()->schedule(this, IceUtil::Time::milliSeconds(_timeout));
+        }
+        catch(const IceUtil::Exception&)
+        {
+            // Ignore, timer is destroyed because of shutdown
+        }
     }
     _state = Pending;
     return true;
-- 
cgit v1.2.3