--- a/datacommsserver/esockserver/UpsCoreProviders/src/upscpractivities.cpp Thu Aug 19 11:05:47 2010 +0300
+++ b/datacommsserver/esockserver/UpsCoreProviders/src/upscpractivities.cpp Tue Aug 31 16:25:36 2010 +0300
@@ -92,12 +92,12 @@
{
iFlags = aFlags;
}
-
+/*
TInt CDeferredCtrlClientJoinActivity::Flags()
{
return iFlags;
}
-
+*/
EXPORT_DEFINE_SMELEMENT(CDeferredCtrlClientJoinActivity::TStoreControlClient, NetStateMachine::MStateTransition, CDeferredCtrlClientJoinActivity::TContext)
EXPORT_C void CDeferredCtrlClientJoinActivity::TStoreControlClient::DoL()
@@ -109,7 +109,6 @@
__ASSERT_DEBUG(act->Client() == TNodeId::NullId(), User::Panic(KSpecAssert_ESockUpsCoreProv, 2));
const TCFControlClient::TJoinRequest& msg = message_cast<TCFControlClient::TJoinRequest>(iContext.iMessage);
act->SetClient(msg.iNodeId);
- act->SetFlags(msg.iClientType.Flags());
}
EXPORT_DEFINE_SMELEMENT(CDeferredCtrlClientJoinActivity::TAddControlClientAndSendJoinComplete, NetStateMachine::MStateTransition, CDeferredCtrlClientJoinActivity::TContext)
@@ -122,7 +121,7 @@
__ASSERT_DEBUG(act->Client() != TNodeId::NullId(), User::Panic(KSpecAssert_ESockUpsCoreProv, 3));
// Add control client
- iContext.Node().AddClientL(act->Client(), TCFClientType(TCFClientType::ECtrl, act->Flags()));
+ iContext.Node().AddClientL(act->Client(), TCFClientType(TCFClientType::ECtrl));
// Send TJoinComplete
RClientInterface::OpenPostMessageClose(iContext.NodeId(), act->Client(), TCFControlClient::TJoinComplete().CRef());