--- a/metadataengine/server/src/mdsnotifier.cpp	Mon Jan 18 20:34:07 2010 +0200
+++ b/metadataengine/server/src/mdsnotifier.cpp	Tue Jan 26 12:13:20 2010 +0200
@@ -108,7 +108,7 @@
 	TUint32 aCompleteCode,
     const RArray<TItemId>& aIdArray )
     {
-    TInt remoteSizeMsgSlot = iRemoteSizeMsgSlot;
+    const TInt remoteSizeMsgSlot = iRemoteSizeMsgSlot;
     iRemoteSizeMsgSlot = KErrNotFound;
 
     __ASSERT_DEBUG( !iDataBuffer, MMdCCommon::Panic( KErrCorrupt ) );
@@ -137,7 +137,7 @@
 	CMdCSerializationBuffer& aBuffer,
 	const RArray<TItemId>& aRelationIdArray)
     {
-    TInt remoteSizeMsgSlot = iRemoteSizeMsgSlot;
+    const TInt remoteSizeMsgSlot = iRemoteSizeMsgSlot;
     iRemoteSizeMsgSlot = KErrNotFound;
 
     __ASSERT_DEBUG( !iDataBuffer, MMdCCommon::Panic( KErrCorrupt ) );
@@ -303,7 +303,7 @@
 void CMdSNotifier::TEntry::TriggerCachedL(TUint32 aCompleteCode, 
 		CMdCSerializationBuffer* aData)
     {
-    TInt remoteSizeMsgSlot = iRemoteSizeMsgSlot;
+    const TInt remoteSizeMsgSlot = iRemoteSizeMsgSlot;
     iRemoteSizeMsgSlot = KErrNotFound;
 
     __ASSERT_DEBUG( !iDataBuffer, MMdCCommon::Panic( KErrCorrupt ) );
@@ -596,7 +596,7 @@
 	            	if(e.IsPending())
 	            		{
 		            	// Match found. Trigger notifier entry.
-		            	TInt err;
+		            	TInt err( KErrNone );
 		            	
 		            	if( allMatches )
 		            		{