diff -r b564fb5fd78b -r 5ebd530e523b datacommsserver/esockserver/ssock/ss_rmetaextensioncontainer.cpp --- a/datacommsserver/esockserver/ssock/ss_rmetaextensioncontainer.cpp Wed Sep 01 12:35:48 2010 +0100 +++ b/datacommsserver/esockserver/ssock/ss_rmetaextensioncontainer.cpp Tue Sep 14 23:38:38 2010 +0300 @@ -67,15 +67,24 @@ EXPORT_C const Meta::SMetaData* RMetaExtensionContainerC::FindExtension(const Meta::STypeId& aTypeId) const { - __ASSERT_ALWAYS(iContainerImpl, PanicMec(ENoImplementation)); - return iContainerImpl->FindExtension(aTypeId); + if (Container()) + { + return Container()->FindExtension(aTypeId); + } + else + { + return NULL; + } } EXPORT_C const Meta::SMetaData& RMetaExtensionContainerC::FindExtensionL(const Meta::STypeId& aTypeId) const { - __ASSERT_ALWAYS(iContainerImpl, PanicMec(ENoImplementation)); - return iContainerImpl->FindExtensionL(aTypeId); + if (!Container()) + { + User::Leave(KErrNotFound); + } + return Container()->FindExtensionL(aTypeId); }