diff -r e78d6e055a5b -r b34d53f6acdf activityfw/storage/server/src/afserver.cpp --- a/activityfw/storage/server/src/afserver.cpp Fri Jul 23 14:03:00 2010 +0300 +++ b/activityfw/storage/server/src/afserver.cpp Fri Aug 06 13:40:46 2010 +0300 @@ -20,6 +20,7 @@ #include "afsession.h" #include "afstorage.h" #include "aftask.h" +#include "afapplicationsengine.h" _LIT( KActivityServerName, "hsactivitydbserver" ); _LIT(KObserverAlreadyExists, "Observer task exists"); @@ -41,8 +42,10 @@ */ CAfServer::~CAfServer() { + delete mAppEngine; delete mStorage; mFsSession.Close(); + mApaSession.Close(); mObservers.ResetAndDestroy(); RFbsSession::Disconnect(); } @@ -66,10 +69,11 @@ void CAfServer::ConstructL() { StartL(KActivityServerName); + User::LeaveIfError(mApaSession.Connect()); User::LeaveIfError(mFsSession.Connect()); User::LeaveIfError(RFbsSession::Connect(mFsSession)); mStorage = CAfStorage::NewL(mFsSession); - mObservers.Array(); + mAppEngine = CAfApplicationsEngine::NewL(mApaSession, *mStorage); } // -----------------------------------------------------------------------------