diff options
| author | Michi Henning <michi@zeroc.com> | 2008-10-17 17:04:16 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2008-10-17 17:04:16 +1000 |
| commit | 4259685e44589a6efbb45f43f054b406dc8cf89c (patch) | |
| tree | d3e26a8201d782e4cd4f617c090cafe9e609d943 /cpp/src/IceGrid/Allocatable.cpp | |
| parent | Changed swish-e perl scripts to tolerate -IceTouch suffix and to avoid (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-4259685e44589a6efbb45f43f054b406dc8cf89c.tar.bz2 ice-4259685e44589a6efbb45f43f054b406dc8cf89c.tar.xz ice-4259685e44589a6efbb45f43f054b406dc8cf89c.zip | |
Merge branch 'R3_3_branch'
Diffstat (limited to 'cpp/src/IceGrid/Allocatable.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Allocatable.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
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; |