diff -r 2d2d25361590 -r d1838696558c ncdengine/provider/deviceinteraction/src/ncdinstallationserviceimpl.cpp --- a/ncdengine/provider/deviceinteraction/src/ncdinstallationserviceimpl.cpp Tue Sep 28 14:48:39 2010 +0300 +++ b/ncdengine/provider/deviceinteraction/src/ncdinstallationserviceimpl.cpp Thu Oct 14 14:11:30 2010 +0300 @@ -495,9 +495,9 @@ } Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); - TRAPD(err, iScrSession.GetComponentL(compId, *entry)); + TRAPD(err, retVal = iScrSession.GetComponentL(compId, *entry)); - if ( err == KErrNotFound ) + if ( err == KErrNotFound || !retVal ) { retVal = EFalse; } @@ -1962,14 +1962,17 @@ // Get widget Usif::TComponentId compId = widgetComponentIdList[i]; Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); - iScrSession.GetComponentL(compId, *entry); + TBool retVal = iScrSession.GetComponentL(compId, *entry); - // Fill id & version - tempInfo->iUid.iUid= compId; - *(tempInfo->iVersion) = entry->Version(); + if ( retVal ) + { + // Fill id & version + tempInfo->iUid.iUid= compId; + *(tempInfo->iVersion) = entry->Version(); - // Append to arrayt - aWidgets.AppendL( tempInfo ); + // Append to arrayt + aWidgets.AppendL( tempInfo ); + } CleanupStack::PopAndDestroy(entry); CleanupStack::Pop( tempInfo ); @@ -2115,7 +2118,7 @@ // Get entry Usif::TComponentId compId = aUid.iUid; Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); - TRAPD(err, iScrSession.GetComponentL(compId, *entry)); + TRAPD(err, retVal = iScrSession.GetComponentL(compId, *entry)); if ( err == KErrNotFound || !retVal ) {