summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/GC.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/GC.cpp')
-rw-r--r--cpp/src/Ice/GC.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/Ice/GC.cpp b/cpp/src/Ice/GC.cpp
index 83144936458..daf08851e72 100644
--- a/cpp/src/Ice/GC.cpp
+++ b/cpp/src/Ice/GC.cpp
@@ -389,7 +389,11 @@ void
IceInternal::GC::updateObserver(const CommunicatorObserverPtr& observer)
{
Monitor<Mutex>::Lock sync(*this);
- assert(observer);
+ if(!observer)
+ {
+ assert(!_communicatorObserver); // Communicator is destroyed.
+ return;
+ }
// Only the first communicator can observe the GC thread.
if(!_communicatorObserver)