--- a/contentstorage/srvsrc/casrv.cpp	Tue Mar 23 23:28:12 2010 +0200
+++ b/contentstorage/srvsrc/casrv.cpp	Tue Mar 23 23:42:03 2010 +0200
@@ -22,7 +22,6 @@
 #include "casrvdef.h"
 #include "casrvsession.h"
 #include "casrvengutils.h"
-#include "catimeout.h"
 #include "castorageproxy.h"
 #include "casrvmanager.h"
 
@@ -139,7 +138,6 @@
     delete iSrvManager;
     delete iSrvEngUtils;
     delete iStorageProxy;
-    delete iExitTimer;
     }
 
 // ---------------------------------------------------------
@@ -167,8 +165,6 @@
 void CCaSrv::ConstructL()
     {
     iSessionCount = 0;
-    iExitTimer = CTimeout::NewL( CActive::EPriorityStandard, TCallBack(
-            StopScheduler, NULL ) );
     iStorageProxy = CCaStorageProxy::NewL();
     iSrvEngUtils = CCaSrvEngUtils::NewL();
     TRAPD( err, iSrvManager = CCaSrvManager::NewL(
@@ -196,7 +192,6 @@
         }
     CSession2* session;
     session = CCaSrvSession::NewL( const_cast<CCaSrv&> ( *this ) );
-    iExitTimer->Cancel(); // We have a client, cancel exit (if pending).
     return session;
     }
 
@@ -216,17 +211,6 @@
 void CCaSrv::DecreaseSessionCount()
     {
     iSessionCount--;
-    if( iSessionCount == 0 )
-        {
-        iExitTimer->Cancel();
-        CActiveScheduler* currentScheduler = CActiveScheduler::Current();
-        // No more sessions; schedule self-deletion.
-        if( currentScheduler )
-            {
-            iExitTimer->After(
-                    TTimeIntervalMicroSeconds32( KCaSrvExitDelay ) );
-            }
-        }
     }
 
 //  End of File