--- a/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_indextableentry_step.cpp	Tue Aug 31 15:41:11 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/test/Unittef/src/t_msv_cache_indextableentry_step.cpp	Wed Sep 01 12:27:27 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -417,7 +417,7 @@
 	MY_ASSERT_EQUALS(iIndexTableEntry->Size(), aCount);
 	for(index = aCount; index < bulkCount; ++index) //manually release remaining entries
 		{
-		CMsvEntryFreePool::Instance()->ReleaseEntryL(entries[index]);
+		CMsvEntryFreePool::Instance()->ReleaseEntry(entries[index]);
 		}
 	
 	//---aCount > aEntries.Count()
@@ -478,8 +478,8 @@
 		MY_ASSERT_TRUE(iIndexTableEntry->EntryExists(entries[index]->GetId()));
 		}
 	MY_ASSERT_EQUALS(iIndexTableEntry->Size(), aCount);
-	CMsvEntryFreePool::Instance()->ReleaseEntryL(entries[0]);
-	CMsvEntryFreePool::Instance()->ReleaseEntryL(entries[4]);
+	CMsvEntryFreePool::Instance()->ReleaseEntry(entries[0]);
+	CMsvEntryFreePool::Instance()->ReleaseEntry(entries[4]);
 		
 	//---out of bounds index
 	iIndexTableEntry->ReleaseBlock(ETrue);
@@ -511,7 +511,7 @@
 	MY_ASSERT_EQUALS(iIndexTableEntry->Size(), 0);
 	for(index = 0; index < bulkCount; ++index)
 		{
-		CMsvEntryFreePool::Instance()->ReleaseEntryL(entries[index]);
+		CMsvEntryFreePool::Instance()->ReleaseEntry(entries[index]);
 		}
 		
 
@@ -908,7 +908,7 @@
 	oEntries.Reset();
 	TRAP_IGNORE(iIndexTableEntry->GetChildrenL(parent->GetId(), oEntries));
 	MY_ASSERT_EQUALS(oEntries.Count(), 11); //entryA + 10 others
-	CMsvEntryFreePool::Instance()->ReleaseEntryL(nonimmediateParent);
+	CMsvEntryFreePool::Instance()->ReleaseEntry(nonimmediateParent);
 	
 	
 	// t4. only grandchildren are present in the block
@@ -949,8 +949,8 @@
 	MY_ASSERT_EQUALS(err, KErrNone);
 	MY_ASSERT_EQUALS(oEntries.Count(), 0);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntryL(nonimmediateParent);
-	CMsvEntryFreePool::Instance()->ReleaseEntryL(parent);
+	CMsvEntryFreePool::Instance()->ReleaseEntry(nonimmediateParent);
+	CMsvEntryFreePool::Instance()->ReleaseEntry(parent);
 	oEntries.Close();
 	tmsvEntries.Close();
 	entries.Close();	
@@ -1044,9 +1044,9 @@
  	TRAP(err, iIndexTableEntry->DeleteEntryL(entryA->GetId(), parentId));
  	MY_ASSERT_EQUALS(err, KErrNotFound);
  	
- 	CMsvEntryFreePool::Instance()->ReleaseEntryL(parent);
- 	CMsvEntryFreePool::Instance()->ReleaseEntryL(entryA);
- 	CMsvEntryFreePool::Instance()->ReleaseEntryL(entryB);
+ 	CMsvEntryFreePool::Instance()->ReleaseEntry(parent);
+ 	CMsvEntryFreePool::Instance()->ReleaseEntry(entryA);
+ 	CMsvEntryFreePool::Instance()->ReleaseEntry(entryB);
  	
  	
  	// t6. bulk additions and deletions
@@ -1084,7 +1084,7 @@
 		}
 	MY_ASSERT_TRUE(iIndexTableEntry->BlockPtr() == NULL);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntryL(parent);
+	CMsvEntryFreePool::Instance()->ReleaseEntry(parent);
 	tmsvEntries.Close();
 	entries.Close();
 	}
@@ -1142,7 +1142,7 @@
 	err = oEntries[0]->GetId() - oEntries[1]->GetId(); //successive entries
 	MY_ASSERT_TRUE(err < 0);
 	
-	CMsvEntryFreePool::Instance()->ReleaseEntryL(parent);
+	CMsvEntryFreePool::Instance()->ReleaseEntry(parent);
 	oEntries.Close();
 	}