--- a/telephonyprotocols/pdplayer/src/PDPSCPR.cpp	Mon Jun 21 16:59:31 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPSCPR.cpp	Thu Jul 15 19:58:53 2010 +0300
@@ -42,12 +42,6 @@
 using namespace NetStateMachine;
 using namespace Factories;
 
-//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 KPDPSCPRPreallocatedActivityBufferSize = KDefaultMaxPreallocatedActivityCount * KMaxPreallocatedActivitySize;
-
 //-=========================================================
 //
 // CPDPSubConnectionProvider Activities
@@ -266,7 +260,7 @@
 IP SubConnection Provider Second Phase Constructor
 */
 	{
-	CCoreSubConnectionProvider::ConstructL(KPDPSCPRPreallocatedActivityBufferSize);
+	CCoreSubConnectionProvider::ConstructL();
 	}
 
 void CPDPSubConnectionProvider::Received(TNodeContextBase& aContext)
@@ -549,7 +543,7 @@
 			{
 			grantedIPAddressInfo->AddParamInfo(aParamInfo);
 
-			iPacketFilterId.Append(aId);
+			User::LeaveIfError(iPacketFilterId.Append(aId));
 			iPacketFilterMaskId |= 1 << aId;
 			}
 		else