--- a/metadataengine/server/src/mdssqlobjectmanipulate.cpp Wed Sep 15 12:40:59 2010 +0300
+++ b/metadataengine/server/src/mdssqlobjectmanipulate.cpp Wed Oct 13 15:02:02 2010 +0300
@@ -71,7 +71,6 @@
CMdSIdentifierGenerator::~CMdSIdentifierGenerator()
{
delete iDigest;
- iDigest = NULL;
}
void CMdSIdentifierGenerator::ConstructL( )
@@ -179,14 +178,11 @@
for (TInt i = 0; i < count; ++i)
{
delete iBuffers[i].iBuffer;
- iBuffers[i].iBuffer = NULL;
}
iBuffers.Close();
delete iGenerator;
- iGenerator = NULL;
delete iUri;
- iUri = NULL;
}
CMdSSqlObjectManipulate::CMdSSqlObjectManipulate( const CMdsSchema& aSchema,
@@ -2271,8 +2267,8 @@
TPtrC16 uri = aBuffer.ReceivePtr16L();
objectId = SearchObjectByUriL( uri, flags );
if ( objectId != KNoId &&
- uri != KSystemFavouritesAlbumUri &&
- uri != KSystemCapturedAlbumUri )
+ objectId != KSystemFavouritesAlbumId &&
+ objectId != KSystemCapturedAlbumId )
{
// unlock object, so update is no possible anymore
if ( iLockList.IsLocked( *iNamespaceDef, objectId ) )