--- a/datacommsserver/esockserver/test/providers/dummy/src/dummypr_subconnprov.cpp	Mon Jun 21 17:02:22 2010 +0300
+++ b/datacommsserver/esockserver/test/providers/dummy/src/dummypr_subconnprov.cpp	Thu Jul 15 20:01:43 2010 +0300
@@ -38,12 +38,6 @@
 using namespace ESock;
 using namespace MeshMachine;
 
-//We reserve space for two preallocated activities that may start concurrently on the SCPR
-//node: destroy and data client stop.
-static const TUint KDefaultMaxPreallocatedActivityCount = 2;
-static const TUint KMaxPreallocatedActivitySize = sizeof(MeshMachine::CNodeRetryParallelActivity) + sizeof(MeshMachine::APreallocatedOriginators<4>);
-static const TUint KDummySCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize;
-
 namespace DummySCPRStates
 {
 DEFINE_SMELEMENT(TRaiseGranted, NetStateMachine::MStateTransition, DummySCPRStates::TContext)
@@ -125,7 +119,7 @@
     if (iContext.iMessage.IsMessage<Messages::TEBase::TError>())
         {
         ASSERT(iContext.iNodeActivity);
-        iContext.iNodeActivity->SetPostedTo(iContext.iNodeActivity->SoleOriginator().Peer().RecipientId());
+        iContext.iNodeActivity->SetPostedTo(iContext.iNodeActivity->SoleOriginator().Peer());
         }
     return EFalse;
     }
@@ -231,7 +225,7 @@
     {
     CDummySubConnectionProvider* self = new (ELeave) CDummySubConnectionProvider(aFactory, DummySCPRStates::stateMap::Self());
     CleanupStack::PushL(self);
-    self->ConstructL(KDummySCPRPreallocatedActivityBufferSize);
+    self->ConstructL();
     CleanupStack::Pop(self);
     return self;
     }
@@ -240,7 +234,7 @@
     {
     CDummySubConnectionProvider* self = new (ELeave) CDummySubConnectionProvider(aFactory, VanillaDummySCPRStates::stateMap::Self());
     CleanupStack::PushL(self);
-    self->ConstructL(KDummySCPRPreallocatedActivityBufferSize);
+    self->ConstructL();
     CleanupStack::Pop(self);
     return self;
     }