harvester/blacklistserver/src/blacklistserver.cpp
changeset 36 aa5a574040a4
parent 25 8e4539ab1889
child 40 910a23996aa0
equal deleted inserted replaced
35:f727727520eb 36:aa5a574040a4
    22 #include "harvesterlog.h"
    22 #include "harvesterlog.h"
    23 #include "mdssqliteconnection.h"
    23 #include "mdssqliteconnection.h"
    24 #include "mdcserializationbuffer.h"
    24 #include "mdcserializationbuffer.h"
    25 
    25 
    26 #include <pathinfo.h>
    26 #include <pathinfo.h>
       
    27 #include "OstTraceDefinitions.h"
       
    28 #ifdef OST_TRACE_COMPILER_IN_USE
       
    29 #include "blacklistserverTraces.h"
       
    30 #endif
       
    31 
    27 
    32 
    28 // Security policy
    33 // Security policy
    29 const TUint KServerPolicyRangeCount = 6;
    34 const TUint KServerPolicyRangeCount = 6;
    30 // Database file without the drive letter
    35 // Database file without the drive letter
    31 _LIT( KBlacklistDatabaseFile, ":[2001B2EB]blacklistdb.sq" );
    36 _LIT( KBlacklistDatabaseFile, ":[2001B2EB]blacklistdb.sq" );
    65 //
    70 //
    66 CPolicyServer::TCustomResult CBlacklistServer::CustomSecurityCheckL(
    71 CPolicyServer::TCustomResult CBlacklistServer::CustomSecurityCheckL(
    67         const RMessage2& aMsg, TInt& /*aAction*/, TSecurityInfo& /*aMissing*/ )
    72         const RMessage2& aMsg, TInt& /*aAction*/, TSecurityInfo& /*aMissing*/ )
    68 	{
    73 	{
    69     WRITELOG( "CBlacklistServer::CustomSecurityCheckL - begin" );
    74     WRITELOG( "CBlacklistServer::CustomSecurityCheckL - begin" );
    70     
    75     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CUSTOMSECURITYCHECKL, "CBlacklistServer::CustomSecurityCheckL -begin" );
       
    76         
    71     CPolicyServer::TCustomResult securityCheckResult = EFail;
    77     CPolicyServer::TCustomResult securityCheckResult = EFail;
    72     
    78     
    73     switch ( aMsg.Function() )
    79     switch ( aMsg.Function() )
    74     	{
    80     	{
    75     	case EBlacklistAdd:
    81     	case EBlacklistAdd:
    90             securityCheckResult = EFail;
    96             securityCheckResult = EFail;
    91             }
    97             }
    92    	    }
    98    	    }
    93     
    99     
    94     WRITELOG( "CBlacklistServer::CustomSecurityCheckL - end" );
   100     WRITELOG( "CBlacklistServer::CustomSecurityCheckL - end" );
    95 
   101     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CUSTOMSECURITYCHECKL, "CBlacklistServer::CustomSecurityCheckL- end" );
       
   102     
    96     return securityCheckResult;
   103     return securityCheckResult;
    97 	}
   104 	}
    98 
   105 
    99 
   106 
   100 // ---------------------------------------------------------------------------
   107 // ---------------------------------------------------------------------------
   103 //
   110 //
   104 CPolicyServer::TCustomResult CBlacklistServer::CustomFailureActionL(
   111 CPolicyServer::TCustomResult CBlacklistServer::CustomFailureActionL(
   105         const RMessage2& /*aMsg*/, TInt /*aAction*/, const TSecurityInfo& /*aMissing*/ )
   112         const RMessage2& /*aMsg*/, TInt /*aAction*/, const TSecurityInfo& /*aMissing*/ )
   106 	{
   113 	{
   107     WRITELOG( "CBlacklistServer::CustomFailureActionL" );
   114     WRITELOG( "CBlacklistServer::CustomFailureActionL" );
   108 
   115     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CUSTOMFAILUREACTIONL, "CBlacklistServer::CustomFailureActionL" );
       
   116     
   109     // Not used
   117     // Not used
   110     return EFail;
   118     return EFail;
   111 	}
   119 	}
   112 
   120 
   113 // ---------------------------------------------------------------------------
   121 // ---------------------------------------------------------------------------
   115 // ---------------------------------------------------------------------------
   123 // ---------------------------------------------------------------------------
   116 //
   124 //
   117 CBlacklistServer* CBlacklistServer::NewL()
   125 CBlacklistServer* CBlacklistServer::NewL()
   118     {
   126     {
   119     WRITELOG( "CBlacklistServer::NewL - begin" );
   127     WRITELOG( "CBlacklistServer::NewL - begin" );
   120 
   128     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_NEWL, "CBlacklistServer::NewL -begin" );
       
   129     
   121     CBlacklistServer* self = NewLC();
   130     CBlacklistServer* self = NewLC();
   122     CleanupStack::Pop( self );
   131     CleanupStack::Pop( self );
   123 
   132 
   124     WRITELOG( "CBlacklistServer::NewL - end" );
   133     WRITELOG( "CBlacklistServer::NewL - end" );
       
   134     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_NEWL, "CBlacklistServer::NewL - end" );
       
   135     
   125     return self;
   136     return self;
   126     }
   137     }
   127 
   138 
   128 // ---------------------------------------------------------------------------
   139 // ---------------------------------------------------------------------------
   129 // CBlacklistServer::NewLC()
   140 // CBlacklistServer::NewLC()
   130 // ---------------------------------------------------------------------------
   141 // ---------------------------------------------------------------------------
   131 //
   142 //
   132 CBlacklistServer* CBlacklistServer::NewLC()
   143 CBlacklistServer* CBlacklistServer::NewLC()
   133     {
   144     {
   134     WRITELOG( "CBlacklistServer::NewLC - begin" );
   145     WRITELOG( "CBlacklistServer::NewLC - begin" );
   135 
   146     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_NEWLC, "CBlacklistServer::NewLC -begin" );
       
   147     
   136     CBlacklistServer* self = new( ELeave ) CBlacklistServer();
   148     CBlacklistServer* self = new( ELeave ) CBlacklistServer();
   137     CleanupStack::PushL( self );
   149     CleanupStack::PushL( self );
   138     self->ConstructL();
   150     self->ConstructL();
   139 
   151 
   140     WRITELOG( "CBlacklistServer::NewLC - end" );
   152     WRITELOG( "CBlacklistServer::NewLC - end" );
       
   153     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_NEWLC, "CBlacklistServer::NewLC - end" );
       
   154     
   141     return self;
   155     return self;
   142     }
   156     }
   143 
   157 
   144 // ---------------------------------------------------------------------------
   158 // ---------------------------------------------------------------------------
   145 // CBlacklistServer::CBlacklistServer()
   159 // CBlacklistServer::CBlacklistServer()
   151     }
   165     }
   152 
   166 
   153 void CBlacklistServer::ConstructL()
   167 void CBlacklistServer::ConstructL()
   154     {
   168     {
   155     WRITELOG( "CBlacklistServer::ConstructL - begin" );
   169     WRITELOG( "CBlacklistServer::ConstructL - begin" );
   156 
   170     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CONSTRUCTL, "CBlacklistServer::ConstructL - begin" );
       
   171     
   157     StartL( KBlacklistServerName );
   172     StartL( KBlacklistServerName );
   158 
   173 
   159     iSqLiteConnection = CMdSSqLiteConnection::NewL();
   174     iSqLiteConnection = CMdSSqLiteConnection::NewL();
   160     
   175     
   161     WRITELOG( "CBlacklistServer::ConstructL - end" );
   176     WRITELOG( "CBlacklistServer::ConstructL - end" );
       
   177     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CONSTRUCTL, "CBlacklistServer::ConstructL -end" );
       
   178     
   162     }
   179     }
   163 
   180 
   164 // ---------------------------------------------------------------------------
   181 // ---------------------------------------------------------------------------
   165 // CBlacklistServer::~CBlacklistServer()
   182 // CBlacklistServer::~CBlacklistServer()
   166 // ---------------------------------------------------------------------------
   183 // ---------------------------------------------------------------------------
   167 //
   184 //
   168 CBlacklistServer::~CBlacklistServer()
   185 CBlacklistServer::~CBlacklistServer()
   169     {
   186     {
   170     WRITELOG( "CBlacklistServer::~CBlacklistServer - begin" );
   187     WRITELOG( "CBlacklistServer::~CBlacklistServer - begin" );
       
   188     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CBLACKLISTSERVER, "CBlacklistServer::~CBlacklistServer -begin" );
   171 
   189 
   172     if ( iDatabaseOpen )
   190     if ( iDatabaseOpen )
   173         {
   191         {
   174         if( iSqLiteConnection )
   192         if( iSqLiteConnection )
   175             {
   193             {
   199    	iBlacklistServerChunk.Close();
   217    	iBlacklistServerChunk.Close();
   200  
   218  
   201     delete iSqLiteConnection;
   219     delete iSqLiteConnection;
   202 
   220 
   203     WRITELOG( "CBlacklistServer::~CBlacklistServer - end" );
   221     WRITELOG( "CBlacklistServer::~CBlacklistServer - end" );
       
   222     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CBLACKLISTSERVER, "CBlacklistServer::~CBlacklistServer -end " );
   204     }
   223     }
   205 
   224 
   206 // ---------------------------------------------------------------------------
   225 // ---------------------------------------------------------------------------
   207 // Closes database connection.
   226 // Closes database connection.
   208 // ---------------------------------------------------------------------------
   227 // ---------------------------------------------------------------------------
   209 //
   228 //
   210 void CBlacklistServer::CloseDB()
   229 void CBlacklistServer::CloseDB()
   211     {
   230     {
   212     WRITELOG( "CBlacklistServer::CloseDB - begin" );
   231     WRITELOG( "CBlacklistServer::CloseDB - begin" );
   213 
   232     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CLOSEDB, "CBlacklistServer::CloseDB -begin" );
       
   233     
   214     if ( iDatabaseOpen )
   234     if ( iDatabaseOpen )
   215         {
   235         {
   216         iSqLiteConnection->CloseDb();
   236         iSqLiteConnection->CloseDb();
   217         iDatabaseOpen = EFalse;
   237         iDatabaseOpen = EFalse;
   218         }
   238         }
   219 
   239 
   220     WRITELOG( "CBlacklistServer::CloseDB - end" );
   240     WRITELOG( "CBlacklistServer::CloseDB - end" );
       
   241     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CLOSEDB, "CBlacklistServer::CloseDB - end" );
       
   242     
   221     }
   243     }
   222 
   244 
   223 // ---------------------------------------------------------------------------
   245 // ---------------------------------------------------------------------------
   224 // CBlacklistServer::ExeMainL()
   246 // CBlacklistServer::ExeMainL()
   225 // ---------------------------------------------------------------------------
   247 // ---------------------------------------------------------------------------
   226 //
   248 //
   227 void CBlacklistServer::ExeMainL()
   249 void CBlacklistServer::ExeMainL()
   228     {
   250     {
   229     WRITELOG( "CBlacklistServer::ExeMainL - begin" );
   251     WRITELOG( "CBlacklistServer::ExeMainL - begin" );
       
   252     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_EXEMAINL, "CBlacklistServer::ExeMainL -begin" );
       
   253     
   230     User::LeaveIfError( User::RenameThread(KBlacklistServerName) );
   254     User::LeaveIfError( User::RenameThread(KBlacklistServerName) );
   231     // Construct active scheduler
   255     // Construct active scheduler
   232     CActiveScheduler* activeScheduler = new ( ELeave ) CActiveScheduler;
   256     CActiveScheduler* activeScheduler = new ( ELeave ) CActiveScheduler;
   233     CleanupStack::PushL( activeScheduler );
   257     CleanupStack::PushL( activeScheduler );
   234 
   258 
   245     // Start handling requests
   269     // Start handling requests
   246     CActiveScheduler::Start();
   270     CActiveScheduler::Start();
   247 
   271 
   248     CleanupStack::PopAndDestroy( 2, activeScheduler );  
   272     CleanupStack::PopAndDestroy( 2, activeScheduler );  
   249     WRITELOG( "CBlacklistServer::ExeMainL - end" );
   273     WRITELOG( "CBlacklistServer::ExeMainL - end" );
       
   274     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_EXEMAINL, "CBlacklistServer::ExeMainL - end" );
       
   275     
   250     }
   276     }
   251 
   277 
   252 // ---------------------------------------------------------------------------
   278 // ---------------------------------------------------------------------------
   253 // TInt E32Main()
   279 // TInt E32Main()
   254 // ---------------------------------------------------------------------------
   280 // ---------------------------------------------------------------------------
   255 //
   281 //
   256 TInt E32Main()
   282 TInt E32Main()
   257     {
   283     {
   258     WRITELOG( "CBlacklistServer::E32Main - begin" );   
   284     WRITELOG( "CBlacklistServer::E32Main - begin" );   
       
   285     OstTrace0( TRACE_NORMAL, _E32MAIN, "CBlacklistServer::E32Main - begin" );
       
   286     
   259     __UHEAP_MARK;
   287     __UHEAP_MARK;
   260     CTrapCleanup* cleanup=CTrapCleanup::New();
   288     CTrapCleanup* cleanup=CTrapCleanup::New();
   261     TInt result = KErrNoMemory;
   289     TInt result = KErrNoMemory;
   262     if (cleanup)
   290     if (cleanup)
   263         {
   291         {
   264         TRAP(result, CBlacklistServer::ExeMainL());
   292         TRAP(result, CBlacklistServer::ExeMainL());
   265         delete cleanup;
   293         delete cleanup;
   266         }
   294         }
   267     __UHEAP_MARKEND;
   295     __UHEAP_MARKEND;
   268     WRITELOG( "CBlacklistServer::E32Main - end" );
   296     WRITELOG( "CBlacklistServer::E32Main - end" );
       
   297     OstTrace0( TRACE_NORMAL, DUP1__E32MAIN, "CBlacklistServer::E32Main -end" );
       
   298     
   269     return result;
   299     return result;
   270     }
   300     }
   271 
   301 
   272 
   302 
   273 // ---------------------------------------------------------------------------
   303 // ---------------------------------------------------------------------------
   275 // ---------------------------------------------------------------------------
   305 // ---------------------------------------------------------------------------
   276 //
   306 //
   277 void CBlacklistServer::OpenDatabaseL()
   307 void CBlacklistServer::OpenDatabaseL()
   278     {
   308     {
   279     WRITELOG( "CBlacklistServer::OpenDatabaseL - begin" );
   309     WRITELOG( "CBlacklistServer::OpenDatabaseL - begin" );
       
   310     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_OPENDATABASEL, "CBlacklistServer::OpenDatabaseL - begin" );
   280     
   311     
   281     if ( iDatabaseOpen )
   312     if ( iDatabaseOpen )
   282         {
   313         {
   283         return; 
   314         return; 
   284         }
   315         }
   305     
   336     
   306     // serialize it for client
   337     // serialize it for client
   307     SerializeToSharedMemoryL();
   338     SerializeToSharedMemoryL();
   308 
   339 
   309     WRITELOG( "CBlacklistServer::OpenDatabaseL - end" );
   340     WRITELOG( "CBlacklistServer::OpenDatabaseL - end" );
       
   341     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_OPENDATABASEL, "CBlacklistServer::OpenDatabaseL - end" );
       
   342     
   310     }
   343     }
   311 
   344 
   312 // ---------------------------------------------------------------------------
   345 // ---------------------------------------------------------------------------
   313 // CBlacklistServer::SerializeToSharedMemoryL()
   346 // CBlacklistServer::SerializeToSharedMemoryL()
   314 // ---------------------------------------------------------------------------
   347 // ---------------------------------------------------------------------------
   315 //
   348 //
   316 void CBlacklistServer::SerializeToSharedMemoryL()
   349 void CBlacklistServer::SerializeToSharedMemoryL()
   317 	{
   350 	{
   318     WRITELOG( "CBlacklistServer::SerializeToSharedMemoryL - begin" );
   351     WRITELOG( "CBlacklistServer::SerializeToSharedMemoryL - begin" );
   319 
   352     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_SERIALIZETOSHAREDMEMORYL, "CBlacklistServer::SerializeToSharedMemoryL - begin" );
       
   353     
   320 	TUint32 bufferSize = 0;
   354 	TUint32 bufferSize = 0;
   321 	TUint32 blacklistMemoryTableCount = iBlacklistMemoryTable.Count();
   355 	TUint32 blacklistMemoryTableCount = iBlacklistMemoryTable.Count();
   322 
   356 
   323     // First add size for item count
   357     // First add size for item count
   324     bufferSize += CMdCSerializationBuffer::KRequiredSizeForTUint32;
   358     bufferSize += CMdCSerializationBuffer::KRequiredSizeForTUint32;
   363     
   397     
   364 	// No need to keep these items anymore
   398 	// No need to keep these items anymore
   365 	iBlacklistMemoryTable.ResetAndDestroy();
   399 	iBlacklistMemoryTable.ResetAndDestroy();
   366 
   400 
   367     WRITELOG( "CBlacklistServer::SerializeToSharedMemoryL - end" );
   401     WRITELOG( "CBlacklistServer::SerializeToSharedMemoryL - end" );
       
   402     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_SERIALIZETOSHAREDMEMORYL, "CBlacklistServer::SerializeToSharedMemoryL- end" );
       
   403     
   368 	}
   404 	}
   369 
   405 
   370 // ---------------------------------------------------------------------------
   406 // ---------------------------------------------------------------------------
   371 // CBlacklistServer::Handle() 
   407 // CBlacklistServer::Handle() 
   372 // ---------------------------------------------------------------------------
   408 // ---------------------------------------------------------------------------
   373 //
   409 //
   374 TInt CBlacklistServer::MemoryHandle()
   410 TInt CBlacklistServer::MemoryHandle()
   375     {
   411     {
   376     WRITELOG( "CBlacklistServer::MemoryHandle" );
   412     WRITELOG( "CBlacklistServer::MemoryHandle" );
       
   413     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_MEMORYHANDLE, "CBlacklistServer::MemoryHandle" );
       
   414     
   377     return iHandle;
   415     return iHandle;
   378     }
   416     }
   379 
   417 
   380 // ---------------------------------------------------------------------------
   418 // ---------------------------------------------------------------------------
   381 // CBlacklistServer::LoadDatabaseToMemoryL()
   419 // CBlacklistServer::LoadDatabaseToMemoryL()
   382 // ---------------------------------------------------------------------------
   420 // ---------------------------------------------------------------------------
   383 //
   421 //
   384 void CBlacklistServer::LoadDatabaseToMemoryL()
   422 void CBlacklistServer::LoadDatabaseToMemoryL()
   385     {
   423     {
   386     WRITELOG( "CBlacklistServer::LoadDatabaseToMemoryL - begin" );
   424     WRITELOG( "CBlacklistServer::LoadDatabaseToMemoryL - begin" );
   387 
   425     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_LOADDATABASETOMEMORYL, "CBlacklistServer::LoadDatabaseToMemoryL - begin" );
       
   426     
   388     iBlacklistMemoryTable.ResetAndDestroy();
   427     iBlacklistMemoryTable.ResetAndDestroy();
   389     RMdsStatement statement;
   428     RMdsStatement statement;
   390     CleanupClosePushL( statement );
   429     CleanupClosePushL( statement );
   391     RRowData emptyRowData;
   430     RRowData emptyRowData;
   392     CleanupClosePushL( emptyRowData );
   431     CleanupClosePushL( emptyRowData );
   413     CleanupStack::PopAndDestroy( &result );        
   452     CleanupStack::PopAndDestroy( &result );        
   414     CleanupStack::PopAndDestroy( &emptyRowData ); 
   453     CleanupStack::PopAndDestroy( &emptyRowData ); 
   415     CleanupStack::PopAndDestroy( &statement ); 
   454     CleanupStack::PopAndDestroy( &statement ); 
   416 
   455 
   417     WRITELOG( "CBlacklistServer::LoadDatabaseToMemoryL - end" );
   456     WRITELOG( "CBlacklistServer::LoadDatabaseToMemoryL - end" );
       
   457     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_LOADDATABASETOMEMORYL, "CBlacklistServer::LoadDatabaseToMemoryL - end" );
       
   458     
   418     }
   459     }
   419 
   460 
   420 // ---------------------------------------------------------------------------
   461 // ---------------------------------------------------------------------------
   421 // CBlacklistServer::CreateBlacklistTableL()
   462 // CBlacklistServer::CreateBlacklistTableL()
   422 // ---------------------------------------------------------------------------
   463 // ---------------------------------------------------------------------------
   423 //
   464 //
   424 void CBlacklistServer::CreateBlacklistTableL()
   465 void CBlacklistServer::CreateBlacklistTableL()
   425     {
   466     {
   426     WRITELOG( "CBlacklistServer::CreateBlacklistTableL - begin" );
   467     WRITELOG( "CBlacklistServer::CreateBlacklistTableL - begin" );
   427 
   468     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CREATEBLACKLISTTABLEL, "CBlacklistServer::CreateBlacklistTableL - begin" );
       
   469     
   428     RRowData emptyRowData;
   470     RRowData emptyRowData;
   429     CleanupClosePushL( emptyRowData );
   471     CleanupClosePushL( emptyRowData );
   430     iSqLiteConnection->ExecuteL( KDropBlacklistTable, emptyRowData );
   472     iSqLiteConnection->ExecuteL( KDropBlacklistTable, emptyRowData );
   431     iSqLiteConnection->ExecuteL( KCreateBlacklistTable, emptyRowData );
   473     iSqLiteConnection->ExecuteL( KCreateBlacklistTable, emptyRowData );
   432 	CleanupStack::PopAndDestroy( &emptyRowData );
   474 	CleanupStack::PopAndDestroy( &emptyRowData );
   433 
   475 
   434     WRITELOG( "CBlacklistServer::CreateBlacklistTableL - end" );
   476     WRITELOG( "CBlacklistServer::CreateBlacklistTableL - end" );
       
   477     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CREATEBLACKLISTTABLEL, "CBlacklistServer::CreateBlacklistTableL - end" );
       
   478     
   435     }
   479     }
   436 
   480 
   437 
   481 
   438 // ---------------------------------------------------------------------------
   482 // ---------------------------------------------------------------------------
   439 // CBlacklistServer::AddToMemoryTableL
   483 // CBlacklistServer::AddToMemoryTableL
   442 void CBlacklistServer::AddToMemoryTableL( const TInt64& aModified,
   486 void CBlacklistServer::AddToMemoryTableL( const TInt64& aModified,
   443         const TDesC& aUri, const TUint32 aMediaId )
   487         const TDesC& aUri, const TUint32 aMediaId )
   444     {
   488     {
   445 
   489 
   446     WRITELOG( "CBlacklistServer::AddToMemoryTableL - begin" );
   490     WRITELOG( "CBlacklistServer::AddToMemoryTableL - begin" );
   447 
   491     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_ADDTOMEMORYTABLEL, "CBlacklistServer::AddToMemoryTableL - begin" );
       
   492     
   448     CBlacklistItem* item = CBlacklistItem::NewL( aModified, aUri, aMediaId );
   493     CBlacklistItem* item = CBlacklistItem::NewL( aModified, aUri, aMediaId );
   449     const TInt err = iBlacklistMemoryTable.Append( item ); // ownership is transferred
   494     const TInt err = iBlacklistMemoryTable.Append( item ); // ownership is transferred
   450     if ( err != KErrNone )
   495     if ( err != KErrNone )
   451         {
   496         {
   452         delete item;
   497         delete item;
   453         }
   498         }
   454 
   499 
   455     WRITELOG( "CBlacklistServer::AddToMemoryTableL - end" );
   500     WRITELOG( "CBlacklistServer::AddToMemoryTableL - end" );
       
   501     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_ADDTOMEMORYTABLEL, "CBlacklistServer::AddToMemoryTableL - end" );
       
   502     
   456     }
   503     }
   457 
   504 
   458 // ---------------------------------------------------------------------------
   505 // ---------------------------------------------------------------------------
   459 // CBlacklistServer::RemoveFromMemoryTable()
   506 // CBlacklistServer::RemoveFromMemoryTable()
   460 // ---------------------------------------------------------------------------
   507 // ---------------------------------------------------------------------------
   462 void CBlacklistServer::RemoveFromMemoryTable( const TDesC& aUri,
   509 void CBlacklistServer::RemoveFromMemoryTable( const TDesC& aUri,
   463         const TUint32 aMediaId )
   510         const TUint32 aMediaId )
   464     {
   511     {
   465 
   512 
   466     WRITELOG( "CBlacklistServer::RemoveFromMemoryTable - begin" );
   513     WRITELOG( "CBlacklistServer::RemoveFromMemoryTable - begin" );
   467 
   514     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_REMOVEFROMMEMORYTABLE, "CBlacklistServer::RemoveFromMemoryTable - begin" );
       
   515     
   468     const TInt index = GetMemoryTableIndex( aUri, aMediaId );
   516     const TInt index = GetMemoryTableIndex( aUri, aMediaId );
   469     if ( index >= 0 )
   517     if ( index >= 0 )
   470         {
   518         {
   471         CBlacklistItem * item = iBlacklistMemoryTable[index];
   519         CBlacklistItem * item = iBlacklistMemoryTable[index];
   472         delete item;
   520         delete item;
   473         iBlacklistMemoryTable.Remove( index );
   521         iBlacklistMemoryTable.Remove( index );
   474         }
   522         }
   475 
   523 
   476     WRITELOG( "CBlacklistServer::RemoveFromMemoryTable - end" );
   524     WRITELOG( "CBlacklistServer::RemoveFromMemoryTable - end" );
       
   525     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_REMOVEFROMMEMORYTABLE, "CBlacklistServer::RemoveFromMemoryTable - end" );
       
   526     
   477     }
   527     }
   478 
   528 
   479 // ---------------------------------------------------------------------------
   529 // ---------------------------------------------------------------------------
   480 // CBlacklistServer::GetMemoryTableIndex()
   530 // CBlacklistServer::GetMemoryTableIndex()
   481 // ---------------------------------------------------------------------------
   531 // ---------------------------------------------------------------------------
   482 //
   532 //
   483 TInt CBlacklistServer::GetMemoryTableIndex( const TDesC& aUri, TUint32 aMediaId )
   533 TInt CBlacklistServer::GetMemoryTableIndex( const TDesC& aUri, TUint32 aMediaId )
   484     {
   534     {
   485     WRITELOG( "CBlacklistServer::GetMemoryTableIndex - begin" );
   535     WRITELOG( "CBlacklistServer::GetMemoryTableIndex - begin" );
   486 
   536     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_GETMEMORYTABLEINDEX, "CBlacklistServer::GetMemoryTableIndex - begin" );
       
   537     
   487     for ( TInt i( 0 ); i < iBlacklistMemoryTable.Count(); ++i )
   538     for ( TInt i( 0 ); i < iBlacklistMemoryTable.Count(); ++i )
   488         {
   539         {
   489         if ( iBlacklistMemoryTable[i]->Compare( aUri, aMediaId ) )
   540         if ( iBlacklistMemoryTable[i]->Compare( aUri, aMediaId ) )
   490             {
   541             {
   491             return i;
   542             return i;
   492             }
   543             }
   493         }
   544         }
   494 
   545 
   495     WRITELOG( "CBlacklistServer::GetMemoryTableIndex - end" );
   546     WRITELOG( "CBlacklistServer::GetMemoryTableIndex - end" );
       
   547     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_GETMEMORYTABLEINDEX, "CBlacklistServer::GetMemoryTableIndex - end" );
       
   548     
   496     return KErrNotFound;
   549     return KErrNotFound;
   497     }
   550     }
   498 
   551 
   499 // ---------------------------------------------------------------------------
   552 // ---------------------------------------------------------------------------
   500 // CBlacklistServer::TableExistsL()
   553 // CBlacklistServer::TableExistsL()
   501 // ---------------------------------------------------------------------------
   554 // ---------------------------------------------------------------------------
   502 //
   555 //
   503 TBool CBlacklistServer::TableExistsL()
   556 TBool CBlacklistServer::TableExistsL()
   504     {
   557     {
   505     WRITELOG( "CBlacklistServer::TableExistsL - begin" );
   558     WRITELOG( "CBlacklistServer::TableExistsL - begin" );
   506 
   559     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_TABLEEXISTSL, "CBlacklistServer::TableExistsL - begin" );
       
   560     
   507     RMdsStatement validationQuery;
   561     RMdsStatement validationQuery;
   508     CleanupClosePushL( validationQuery );
   562     CleanupClosePushL( validationQuery );
   509     RRowData emptyRowData;
   563     RRowData emptyRowData;
   510     CleanupClosePushL( emptyRowData );
   564     CleanupClosePushL( emptyRowData );
   511     TRAPD( err, iSqLiteConnection->ExecuteQueryL(
   565     TRAPD( err, iSqLiteConnection->ExecuteQueryL(
   513 	validationQuery.Close();
   567 	validationQuery.Close();
   514 	CleanupStack::PopAndDestroy( &emptyRowData ); // emptyRowData
   568 	CleanupStack::PopAndDestroy( &emptyRowData ); // emptyRowData
   515 	CleanupStack::PopAndDestroy( &validationQuery ); // validationQuery
   569 	CleanupStack::PopAndDestroy( &validationQuery ); // validationQuery
   516 
   570 
   517     WRITELOG( "CBlacklistServer::TableExistsL - end" );
   571     WRITELOG( "CBlacklistServer::TableExistsL - end" );
   518 
   572     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_TABLEEXISTSL, "CBlacklistServer::TableExistsL - end" );
       
   573     
   519     return ( err == KErrNone );
   574     return ( err == KErrNone );
   520     }
   575     }
   521 
   576 
   522 // ---------------------------------------------------------------------------
   577 // ---------------------------------------------------------------------------
   523 // CBlacklistServer::NewSessionL()
   578 // CBlacklistServer::NewSessionL()
   524 // ---------------------------------------------------------------------------
   579 // ---------------------------------------------------------------------------
   525 //
   580 //
   526 CSession2* CBlacklistServer::NewSessionL( const TVersion& aVersion, const RMessage2& /*aMessage*/ ) const
   581 CSession2* CBlacklistServer::NewSessionL( const TVersion& aVersion, const RMessage2& /*aMessage*/ ) const
   527     {
   582     {
   528     WRITELOG( "CBlacklistServer::NewSessionL - begin" );
   583     WRITELOG( "CBlacklistServer::NewSessionL - begin" );
   529 
   584     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_NEWSESSIONL, "CBlacklistServer::NewSessionL - begin" );
       
   585     
   530     // Check we are the right version
   586     // Check we are the right version
   531     if ( !User::QueryVersionSupported( TVersion( KBlacklistServerMajorVersion,
   587     if ( !User::QueryVersionSupported( TVersion( KBlacklistServerMajorVersion,
   532                                                  KBlacklistServerMinorVersion,
   588                                                  KBlacklistServerMinorVersion,
   533                                                  KBlacklistServerBuildVersion ),
   589                                                  KBlacklistServerBuildVersion ),
   534                                        aVersion ) )
   590                                        aVersion ) )
   535     	{
   591     	{
   536         User::Leave( KErrNotSupported );
   592         User::Leave( KErrNotSupported );
   537     	}
   593     	}
   538     
   594     
   539     WRITELOG( "CBlacklistServer::NewSessionL - end" );
   595     WRITELOG( "CBlacklistServer::NewSessionL - end" );
   540 
   596     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_NEWSESSIONL, "CBlacklistServer::NewSessionL - end" );
       
   597     
   541     return new( ELeave ) CBlacklistSession;
   598     return new( ELeave ) CBlacklistSession;
   542     }
   599     }
   543 
   600 
   544 // ---------------------------------------------------------------------------
   601 // ---------------------------------------------------------------------------
   545 // CBlacklistServer::RunError()
   602 // CBlacklistServer::RunError()
   546 // ---------------------------------------------------------------------------
   603 // ---------------------------------------------------------------------------
   547 //
   604 //
   548 TInt CBlacklistServer::RunError( TInt aError )
   605 TInt CBlacklistServer::RunError( TInt aError )
   549     {
   606     {
   550     WRITELOG1( "CBlacklistServer::RunError - begin, error %d", aError );
   607     WRITELOG1( "CBlacklistServer::RunError - begin, error %d", aError );
   551 
   608     OstTrace1( TRACE_NORMAL, CBLACKLISTSERVER_RUNERROR, "CBlacklistServer::RunError - begin, error %d", aError );
       
   609     
   552     // Bad descriptor implies bad client
   610     // Bad descriptor implies bad client
   553     if ( aError == KErrBadDescriptor )
   611     if ( aError == KErrBadDescriptor )
   554         {
   612         {
   555         Message().Panic( KBlacklistServerName, aError );
   613         Message().Panic( KBlacklistServerName, aError );
   556         }
   614         }
   561 
   619 
   562     // Continue handling requests
   620     // Continue handling requests
   563     ReStart();
   621     ReStart();
   564 
   622 
   565     WRITELOG( "CBlacklistServer::RunError - end" );
   623     WRITELOG( "CBlacklistServer::RunError - end" );
   566 
   624     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_RUNERROR, "CBlacklistServer::RunError - end" );
       
   625     
   567     return KErrNone;
   626     return KErrNone;
   568     }
   627     }
   569 
   628 
   570 // ---------------------------------------------------------------------------
   629 // ---------------------------------------------------------------------------
   571 // CBlacklistServer::AddSession()
   630 // CBlacklistServer::AddSession()
   572 // ---------------------------------------------------------------------------
   631 // ---------------------------------------------------------------------------
   573 //
   632 //
   574 void CBlacklistServer::AddSession()
   633 void CBlacklistServer::AddSession()
   575     {
   634     {
   576     WRITELOG( "CBlacklistServer::AddSession" );
   635     WRITELOG( "CBlacklistServer::AddSession" );
       
   636     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_ADDSESSION, "CBlacklistServer::AddSession" );
       
   637     
   577     ++iSessionCount;
   638     ++iSessionCount;
   578     }
   639     }
   579 
   640 
   580 // ---------------------------------------------------------------------------
   641 // ---------------------------------------------------------------------------
   581 // CBlacklistServer::RemoveSession()
   642 // CBlacklistServer::RemoveSession()
   582 // ---------------------------------------------------------------------------
   643 // ---------------------------------------------------------------------------
   583 //
   644 //
   584 void CBlacklistServer::RemoveSession()
   645 void CBlacklistServer::RemoveSession()
   585     {
   646     {
   586     WRITELOG( "CBlacklistServer::RemoveSession - begin" );
   647     WRITELOG( "CBlacklistServer::RemoveSession - begin" );
   587 
   648     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_REMOVESESSION, "CBlacklistServer::RemoveSession - begin" );
       
   649     
   588     --iSessionCount;
   650     --iSessionCount;
   589     
   651     
   590 #ifdef _DEBUG
   652 #ifdef _DEBUG
   591     TRAPD ( err, WriteAllDataToDBL() );
   653     TRAPD ( err, WriteAllDataToDBL() );
   592 #else
   654 #else
   593     TRAP_IGNORE ( WriteAllDataToDBL() );
   655     TRAP_IGNORE ( WriteAllDataToDBL() );
   594 #endif
   656 #endif
   595     WRITELOG1( "CBlacklistServer::RemoveSession - err %d", err  );
   657     WRITELOG1( "CBlacklistServer::RemoveSession - err %d", err  );
       
   658 #ifdef _DEBUG    
       
   659     OstTrace1( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_REMOVESESSION, "CBlacklistServer::RemoveSession - err %d", err );
       
   660 #endif
   596     
   661     
   597     if ( iSessionCount == 0 )
   662     if ( iSessionCount == 0 )
   598         {
   663         {
   599         CActiveScheduler::Stop();
   664         CActiveScheduler::Stop();
   600         }
   665         }
   601 
   666 
   602     WRITELOG( "CBlacklistServer::RemoveSession - end" );
   667     WRITELOG( "CBlacklistServer::RemoveSession - end" );
       
   668     OstTrace0( TRACE_NORMAL, DUP2_CBLACKLISTSERVER_REMOVESESSION, "CBlacklistServer::RemoveSession - end" );
       
   669     
   603     }
   670     }
   604 
   671 
   605 // ---------------------------------------------------------------------------
   672 // ---------------------------------------------------------------------------
   606 // CBlacklistServer::AddL()
   673 // CBlacklistServer::AddL()
   607 // ---------------------------------------------------------------------------
   674 // ---------------------------------------------------------------------------
   608 //
   675 //
   609 void CBlacklistServer::AddL( const TUint32& mediaId, const TDesC& aUri, const TTime& aLastModifiedTime ) 
   676 void CBlacklistServer::AddL( const TUint32& mediaId, const TDesC& aUri, const TTime& aLastModifiedTime ) 
   610     {
   677     {
   611     WRITELOG( "CBlacklistServer::AddL - begin" );
   678     WRITELOG( "CBlacklistServer::AddL - begin" );
   612 
   679     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_ADDL, "CBlacklistServer::AddL - begin" );
       
   680     
   613     AddToMemoryTableL( aLastModifiedTime.Int64(), aUri, mediaId );
   681     AddToMemoryTableL( aLastModifiedTime.Int64(), aUri, mediaId );
   614 
   682 
   615     WRITELOG( "CBlacklistServer::AddL - end" );
   683     WRITELOG( "CBlacklistServer::AddL - end" );
       
   684     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_ADDL, "CBlacklistServer::AddL - end" );
       
   685     
   616     } 
   686     } 
   617 
   687 
   618 // ---------------------------------------------------------------------------
   688 // ---------------------------------------------------------------------------
   619 // CBlacklistServer::RemoveL()
   689 // CBlacklistServer::RemoveL()
   620 // ---------------------------------------------------------------------------
   690 // ---------------------------------------------------------------------------
   621 //
   691 //
   622 void CBlacklistServer::RemoveL( const TUint32& mediaId, const TDesC& aUri ) 
   692 void CBlacklistServer::RemoveL( const TUint32& mediaId, const TDesC& aUri ) 
   623     {
   693     {
   624     WRITELOG( "CBlacklistServer::RemoveL - begin" );
   694     WRITELOG( "CBlacklistServer::RemoveL - begin" );
   625 
   695     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_REMOVEL, "CBlacklistServer::RemoveL - begin" );
       
   696     
   626     RemoveFromMemoryTable( aUri, mediaId );
   697     RemoveFromMemoryTable( aUri, mediaId );
   627 
   698 
   628     WRITELOG( "CBlacklistServer::RemoveL - end" );
   699     WRITELOG( "CBlacklistServer::RemoveL - end" );
       
   700     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_REMOVEL, "CBlacklistServer::RemoveL - end" );
       
   701     
   629     } 
   702     } 
   630  
   703  
   631 // ---------------------------------------------------------------------------
   704 // ---------------------------------------------------------------------------
   632 // CBlacklistServer::RemoveFromDBL()
   705 // CBlacklistServer::RemoveFromDBL()
   633 // ---------------------------------------------------------------------------
   706 // ---------------------------------------------------------------------------
   634 //
   707 //
   635 void CBlacklistServer::RemoveFromDBL( const TDesC& aUri, const TUint32 aMediaId )
   708 void CBlacklistServer::RemoveFromDBL( const TDesC& aUri, const TUint32 aMediaId )
   636     {
   709     {
   637     WRITELOG( "CBlacklistServer::RemoveFromDBL - begin" );
   710     WRITELOG( "CBlacklistServer::RemoveFromDBL - begin" );
       
   711     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_REMOVEFROMDBL, "CBlacklistServer::RemoveFromDBL - begin" );
   638     
   712     
   639     RRowData* variables = new ( ELeave ) RRowData();        
   713     RRowData* variables = new ( ELeave ) RRowData();        
   640     CleanupStack::PushL( variables );
   714     CleanupStack::PushL( variables );
   641     CleanupClosePushL( *variables );
   715     CleanupClosePushL( *variables );
   642  
   716  
   664         iSqLiteConnection->ExecuteL( KMdsBlacklistDelete, *variables );
   738         iSqLiteConnection->ExecuteL( KMdsBlacklistDelete, *variables );
   665         CleanupStack::PopAndDestroy( 2, variables );
   739         CleanupStack::PopAndDestroy( 2, variables );
   666         }
   740         }
   667     
   741     
   668     WRITELOG( "CBlacklistServer::RemoveFromDBL - end" );
   742     WRITELOG( "CBlacklistServer::RemoveFromDBL - end" );
       
   743     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_REMOVEFROMDBL, "CBlacklistServer::RemoveFromDBL - end" );
       
   744     
   669     }
   745     }
   670 
   746 
   671 
   747 
   672 // ---------------------------------------------------------------------------
   748 // ---------------------------------------------------------------------------
   673 // CBlacklistServer::AddDBL()
   749 // CBlacklistServer::AddDBL()
   675 //
   751 //
   676 void CBlacklistServer::AddToDBL( const TDesC& aUri, const TUint32 aMediaId,
   752 void CBlacklistServer::AddToDBL( const TDesC& aUri, const TUint32 aMediaId,
   677     const TInt64& aLastModifiedTime ) 
   753     const TInt64& aLastModifiedTime ) 
   678     {
   754     {
   679     WRITELOG( "CBlacklistServer::AddToDBL - begin" );
   755     WRITELOG( "CBlacklistServer::AddToDBL - begin" );
   680   
   756     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_ADDTODBL, "CBlacklistServer::AddToDBL - begin" );
       
   757    
   681     RRowData* rowData = new ( ELeave ) RRowData();        
   758     RRowData* rowData = new ( ELeave ) RRowData();        
   682     CleanupStack::PushL( rowData );
   759     CleanupStack::PushL( rowData );
   683     CleanupClosePushL( *rowData );
   760     CleanupClosePushL( *rowData );
   684     
   761     
   685     if ( !iDatabaseOpen )
   762     if ( !iDatabaseOpen )
   709             }
   786             }
   710         CleanupStack::PopAndDestroy( 2, rowData );
   787         CleanupStack::PopAndDestroy( 2, rowData );
   711         }
   788         }
   712 
   789 
   713     WRITELOG( "CBlacklistServer::AddToDBL - end" );
   790     WRITELOG( "CBlacklistServer::AddToDBL - end" );
       
   791     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_ADDTODBL, "CBlacklistServer::AddToDBL - end" );
       
   792     
   714     } 
   793     } 
   715 
   794 
   716 // ---------------------------------------------------------------------------
   795 // ---------------------------------------------------------------------------
   717 // CBlacklistServer::WriteAllDataToDBL()
   796 // CBlacklistServer::WriteAllDataToDBL()
   718 // ---------------------------------------------------------------------------
   797 // ---------------------------------------------------------------------------
   719 //
   798 //
   720 void CBlacklistServer::WriteAllDataToDBL()
   799 void CBlacklistServer::WriteAllDataToDBL()
   721     {
   800     {
   722     WRITELOG( "CBlacklistServer::WriteAllDataToDBL - begin" );
   801     WRITELOG( "CBlacklistServer::WriteAllDataToDBL - begin" );
   723 
   802     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_WRITEALLDATATODBL, "CBlacklistServer::WriteAllDataToDBL - begin" );
       
   803     
   724     for ( TInt i( 0 ); i < iBlacklistMemoryTable.Count(); ++i )
   804     for ( TInt i( 0 ); i < iBlacklistMemoryTable.Count(); ++i )
   725         {
   805         {
   726         AddToDBL(  *iBlacklistMemoryTable[i]->Uri(),  iBlacklistMemoryTable[i]->MediaId(), iBlacklistMemoryTable[i]->Modified() );
   806         AddToDBL(  *iBlacklistMemoryTable[i]->Uri(),  iBlacklistMemoryTable[i]->MediaId(), iBlacklistMemoryTable[i]->Modified() );
   727         }
   807         }
   728 
   808 
   729     WRITELOG( "CBlacklistServer::WriteAllDataToDBL - end" );
   809     WRITELOG( "CBlacklistServer::WriteAllDataToDBL - end" );
       
   810     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_WRITEALLDATATODBL, "CBlacklistServer::WriteAllDataToDBL - end" );
       
   811     
   730     }
   812     }
   731 
   813 
   732 // ---------------------------------------------------------------------------
   814 // ---------------------------------------------------------------------------
   733 // CBlacklistServer::WriteAllDataToDBL()
   815 // CBlacklistServer::WriteAllDataToDBL()
   734 // ---------------------------------------------------------------------------
   816 // ---------------------------------------------------------------------------
   735 //
   817 //
   736 void CBlacklistServer::CommitBufferedItemsL()
   818 void CBlacklistServer::CommitBufferedItemsL()
   737     {
   819     {
   738     WRITELOG( "CBlacklistServer::CommitBufferedItemsL - begin" );
   820     WRITELOG( "CBlacklistServer::CommitBufferedItemsL - begin" );
   739    
   821     OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_COMMITBUFFEREDITEMSL, "CBlacklistServer::CommitBufferedItemsL - begin" );
       
   822     
   740     // First, removed items
   823     // First, removed items
   741     const TInt removedCount( iBufferedRemoveItems.Count() );
   824     const TInt removedCount( iBufferedRemoveItems.Count() );
   742     for ( TInt i( 0 ); i < removedCount; ++i )
   825     for ( TInt i( 0 ); i < removedCount; ++i )
   743         {
   826         {
   744         iSqLiteConnection->ExecuteL( KMdsBlacklistDelete, *iBufferedRemoveItems[i] );
   827         iSqLiteConnection->ExecuteL( KMdsBlacklistDelete, *iBufferedRemoveItems[i] );
   752         iSqLiteConnection->ExecuteL( KMdsBlacklistUpdate, *iBufferedAddedItems[i] );
   835         iSqLiteConnection->ExecuteL( KMdsBlacklistUpdate, *iBufferedAddedItems[i] );
   753         iBufferedAddedItems[i]->Column( 0 ).Free();  
   836         iBufferedAddedItems[i]->Column( 0 ).Free();  
   754         }
   837         }
   755 
   838 
   756     WRITELOG( "CBlacklistServer::CommitBufferedItemsL - end" );
   839     WRITELOG( "CBlacklistServer::CommitBufferedItemsL - end" );
       
   840     OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_COMMITBUFFEREDITEMSL, "CBlacklistServer::CommitBufferedItemsL - end" );
       
   841     
   757     }
   842     }
   758 
   843 
   759 // End of File
   844 // End of File