diff -r 81ac5e25e8c2 -r 9c2cfada5e72 src/core/object.cc --- a/src/core/object.cc Wed Apr 09 10:04:16 2008 -0700 +++ b/src/core/object.cc Thu Apr 10 13:16:43 2008 -0700 @@ -114,6 +114,13 @@ NS_ASSERT (!o->m_disposed); NS_ASSERT (CheckLoose ()); NS_ASSERT (o->CheckLoose ()); + + if (DoGetObject (o->m_tid)) + { + NS_FATAL_ERROR ("Object::AggregateObject(): " + "Multiple aggregation of objects of type " << o->m_tid.GetName ()); + } + Object *other = PeekPointer (o); Object *next = m_next; m_next = other->m_next;