--- a/vpnengine/sit/inc/taskarrivalobserver.h	Wed Sep 01 12:23:21 2010 +0100
+++ b/vpnengine/sit/inc/taskarrivalobserver.h	Tue Sep 14 23:16:15 2010 +0300
@@ -32,14 +32,13 @@
 /**
  * Combined task handler arrival observer and task handler manager.
  */
-NONSHARABLE_CLASS(CTaskArrivalObserver) : public CAsyncOneShot, public MEventObserver, public MTaskHandlerManager
+NONSHARABLE_CLASS(CTaskArrivalObserver) : public CBase,
+                                          public MEventObserver, 
+                                          public MTaskHandlerManager
     {
 public:
     static CTaskArrivalObserver* NewL();
     ~CTaskArrivalObserver();
-
-private: // From CAsyncOneShot
-    void RunL();
     
 public:
     void Start();
@@ -59,17 +58,12 @@
     void ConstructL();
 
 private: // Implementation
-    void LaunchTaskHandlerL(const TTaskArrivedEventData& aEventSpec);
-    CTaskHandler* CreateTaskHandlerL(const TTaskArrivedEventData& aEventSpec);
-    TInt FindTaskHandler(CTaskHandler* aTaskHandler);
-    TInt FindAsyncCleaner(CAsyncCleaner* aAsyncCleaner);
-    void AsyncDeleteTaskHandler(CTaskHandler* aTaskHandler);
+    void LaunchTaskHandlerL(const TTaskArrivedEventData& aEventSpec);    
 
 private:
     REventMediator iEventMediator;
     CArrayPtrFlat<CTaskHandler>* iTaskHandlerList;
     CArrayPtrFlat<CAsyncCleaner>* iAsyncCleanerList;
-    CTaskHandler* iTaskHandlerToDelete;
     };
 
 NONSHARABLE_CLASS(CAsyncCleaner) : public CAsyncOneShot
@@ -77,8 +71,8 @@
 public:
     CAsyncCleaner(CTaskArrivalObserver* aTaskArrivalObserver,
                   CTaskHandler* aTaskHandlerToDelete);
-    void Start();
-        
+    void Start();        
+    TBool IsMatchingCleaner(const CTaskHandler& aTaskHandler) const;
 private: // From CAsyncOneShot
     void RunL();