--- a/userlibandfileserver/fileserver/sfile/sf_memory_man.cpp Tue Feb 02 01:24:03 2010 +0200
+++ b/userlibandfileserver/fileserver/sfile/sf_memory_man.cpp Sat Feb 20 00:10:51 2010 +0200
@@ -125,10 +125,9 @@
// if it is a new drive/file system who wants to connect, create a new client for it
// parameter validation
- ASSERT(iSizeInBytes > iCurrentOffsetMark + (aMaxSizeInSegs << SegmentSizeInBytesLog2()));
if (iSizeInBytes < iCurrentOffsetMark + (aMaxSizeInSegs << SegmentSizeInBytesLog2()))
{
- ASSERT(0);
+ __PRINT1(_L("CCacheMemoryManager::ConnectClientL([%S]) failed, please check \"GlobalCacheMemorySize\" setting!!!"), &aClientName);
User::Leave(KErrArgument);
}
@@ -140,7 +139,6 @@
TInt err = iRegisteredClients.Append(client);
if (err != KErrNone)
{
- ASSERT(0);
delete client;
client = NULL;
User::Leave(err);
@@ -289,7 +287,10 @@
*/
void CCacheMemoryManagerFactory::CreateL()
{
- iCacheMemoryManager = CCacheMemoryManager::NewL(TGlobalCacheMemorySettings::CacheSize());
+ if (TGlobalCacheMemorySettings::CacheSize() > 0)
+ iCacheMemoryManager = CCacheMemoryManager::NewL(TGlobalCacheMemorySettings::CacheSize());
+ else
+ __PRINT(_L("\"GlobalCacheMemorySize\" set <= 0, CCacheMemoryManager is not created!!!"));
}
/**