--- a/persistentstorage/sql/SRC/Common/SqlMap.inl	Fri Mar 12 15:51:02 2010 +0200
+++ b/persistentstorage/sql/SRC/Common/SqlMap.inl	Mon Mar 15 12:46:30 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2010 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"
@@ -132,6 +132,13 @@
 			{
 			iDestructor.Destroy(pair.iKey, pair.iData);
 			iSet.Remove(idx);
+#ifdef _DEBUG
+//This is used prevent the failure of the resource allocation checking in debug mode. 
+                if(iSet.Count() == 0)
+                    {
+                    iSet.Reset();
+                    }
+#endif  
 			}
 		return;
 		}