equal
deleted
inserted
replaced
328 iServerThread = new CDatabaseManagerServerThread(); |
328 iServerThread = new CDatabaseManagerServerThread(); |
329 iServerThread->start(); |
329 iServerThread->start(); |
330 iServerThread->wait(1); |
330 iServerThread->wait(1); |
331 #else |
331 #else |
332 TRequestStatus status; |
332 TRequestStatus status; |
333 RProcess dbServer; |
333 RProcess dbServer; |
334 ret = dbServer.Create(KDatabaseManagerServerName, KNullDesC); |
334 ret = dbServer.Create(KDatabaseManagerServerProcess, KNullDesC); |
335 if(ret != KErrNone) |
335 if(ret != KErrNone) |
336 { |
336 { |
337 return ret; |
337 return ret; |
338 } |
338 } |
339 dbServer.Rendezvous(status); |
339 dbServer.Rendezvous(status); |
527 { |
527 { |
528 CDatabaseManagerServer *dbManagerServer = new CDatabaseManagerServer(); |
528 CDatabaseManagerServer *dbManagerServer = new CDatabaseManagerServer(); |
529 __ASSERT_ALWAYS(dbManagerServer != NULL, CDatabaseManagerServer::PanicServer(ESrvCreateServer)); |
529 __ASSERT_ALWAYS(dbManagerServer != NULL, CDatabaseManagerServer::PanicServer(ESrvCreateServer)); |
530 |
530 |
531 TInt err = dbManagerServer->Start(KDatabaseManagerServerName); |
531 TInt err = dbManagerServer->Start(KDatabaseManagerServerName); |
532 if (err != KErrNone) |
532 if (err != KErrNone && err != KErrAlreadyExists) |
533 { |
533 { |
534 CDatabaseManagerServer::PanicServer(ESvrStartServer); |
534 CDatabaseManagerServer::PanicServer(ESvrStartServer); |
535 } |
535 } |
536 RThread::Rendezvous(KErrNone); |
536 RThread::Rendezvous(KErrNone); |
537 |
537 |