--- a/cmmanager/cmmgr/cmmserver/src/cmmconnmethodstruct.cpp Fri May 14 16:15:46 2010 +0300
+++ b/cmmanager/cmmgr/cmmserver/src/cmmconnmethodstruct.cpp Thu May 27 13:17:01 2010 +0300
@@ -172,11 +172,9 @@
}
// ---------------------------------------------------------------------------
-// TODO
-//
-// Refresh the relevant connection method data in cache side object to be in
-// synch with database and copy that data back to this session side connection
-// method object.
+// Refresh the connection method data in this cache side object to be in synch
+// with the database and copy that data back to the session side connection
+// method instance given as parameter.
// ---------------------------------------------------------------------------
//
void CCmmConnMethodStruct::RefreshConnMethodInstanceL(
@@ -236,8 +234,7 @@
}
// ---------------------------------------------------------------------------
-// Set the connection method plugin. Updates status and sets reference
-// counter to 1.
+// Set the connection method plugin pointer, bearer type and status.
// ---------------------------------------------------------------------------
//
void CCmmConnMethodStruct::SetPlugin(
@@ -251,13 +248,13 @@
// when data is copied into it.
if ( iReferenceCounter != 0 )
{
- ASSERT( 0 ); // Error.
+ ASSERT( 0 ); // Error, wrong internal status.
}
iConnMethodPlugin = aPlugin;
iBearerType = aBearerType;
- switch ( aStatus ) //TODO, add missing status
+ switch ( aStatus )
{
// Fallthrough intended
case ECmmConnMethodStatusNotSaved:
@@ -265,9 +262,10 @@
iStatus = aStatus;
break;
case ECmmConnMethodStatusChanged:
+ case ECmmConnMethodStatusToBeDeleted:
default:
iStatus = ECmmConnMethodStatusChanged;
- ASSERT( 0 ); // Error, invalid status.
+ ASSERT( 0 ); // Error, invalid status as argument.
break;
}