--- a/datacommsserver/esockserver/test/providers/dummy/src/dummypr_metaconnprov.cpp	Mon Mar 15 12:45:15 2010 +0200
+++ b/datacommsserver/esockserver/test/providers/dummy/src/dummypr_metaconnprov.cpp	Wed Mar 31 23:27:09 2010 +0300
@@ -20,6 +20,7 @@
  @internalComponent
 */
 
+
 #include <comms-infras/ss_log.h>
 #include <comms-infras/coremcprstates.h>
 #include <comms-infras/coremcpractivities.h>
@@ -39,6 +40,8 @@
 using namespace Messages;
 using namespace MeshMachine;
 
+
+
 CDummyMetaConnectionProvider* CDummyMetaConnectionProvider::NewL(CMetaConnectionProviderFactoryBase& aFactory,
                                                                      const TProviderInfo& aProviderInfo)
 	{
@@ -59,14 +62,16 @@
 
 CDummyMetaConnectionProvider::~CDummyMetaConnectionProvider()
 	{
-	delete iPubSubSubscriber;
+	delete iPubSubAvailability;
+	delete iPubSubStopTrigger;
 	LOG_NODE_DESTROY(KDummyMCprTag, CDummyMetaConnectionProvider);
 	}
 
 void CDummyMetaConnectionProvider::ConstructL()
     {
     CMobilityMetaConnectionProvider::ConstructL();
-    iPubSubSubscriber = CMCPrPubSubSubscriber::NewL(*this, ProviderInfo().APId());
+    iPubSubAvailability = CMCPrPubSubAvailability::NewL(*this, ProviderInfo().APId());
+    iPubSubStopTrigger  = CMCPrPubSubStopTrigger::NewL(*this, 0);
     }
 
 void CDummyMetaConnectionProvider::ReceivedL(const TRuntimeCtxId& aSender, const TNodeId& aRecipient, TSignatureBase& aMessage)
@@ -84,18 +89,19 @@
     {
     if (!GetFirstClient<TDefaultClientMatchPolicy>(TClientType(TCFClientType::EServProvider)))
         {
-        ASSERT(iPubSubSubscriber!=NULL);
-        RNodeInterface* peer = AddClientL(iPubSubSubscriber->Id(), TClientType(TClientType::ERegistrar, TCFClientType::EAvailabilityProvider));
-        iPubSubSubscriber->StartAvailabilityMonitoringL(aAvailabilityActivity);
+        ASSERT(iPubSubAvailability!=NULL);
+        RNodeInterface* peer = AddClientL(iPubSubAvailability->Id(), TClientType(TClientType::ERegistrar, TCFClientType::EAvailabilityProvider));
+        iPubSubAvailability->StartAvailabilityMonitoringL(aAvailabilityActivity);
         }
     }
 
 void CDummyMetaConnectionProvider::CancelAvailabilityMonitoring()
     {
     if (!GetFirstClient<TDefaultClientMatchPolicy>(TClientType(TCFClientType::EServProvider)))
-        {    
-        ASSERT(iPubSubSubscriber!=NULL);    
-        RemoveClient(iPubSubSubscriber->Id());
-        iPubSubSubscriber->CancelAvailabilityMonitoring();
+        {
+        ASSERT(iPubSubAvailability!=NULL);
+        RemoveClient(iPubSubAvailability->Id());
+        iPubSubAvailability->CancelAvailabilityMonitoring();
         }
     }
+