--- a/commsfwtools/preparedefaultcommsdatabase/src/CommsDatValidator.cpp	Fri Mar 12 15:49:41 2010 +0200
+++ b/commsfwtools/preparedefaultcommsdatabase/src/CommsDatValidator.cpp	Mon Mar 15 12:45:15 2010 +0200
@@ -1927,7 +1927,7 @@
     else
     	{
     	//The IPProto AP is already exsiting. Use that one.
-    	ipprotoAP = CommsDatMapperAndValidator::LoadTheAPL(iLinkAPTagId, iSession.iOwner);
+    	ipprotoAP = CommsDatMapperAndValidator::LoadIPProtoAccessPointL(iLinkAPTagId, iSession.iOwner);
     	
     	CleanupStack::PushL(ipprotoAP);
     	}
@@ -2044,7 +2044,8 @@
     	 * a new one should be generated.
     	 */
     	
-    	if (!CommsDatMapperAndValidator::IsIPProtoAPAlreadyExistL(iLinkAPTagId, iSession.iOwner))
+        apRecordToBeModified = CommsDatMapperAndValidator::LoadIPProtoAccessPoint(iLinkAPTagId, iSession.iOwner);
+    	if (!apRecordToBeModified)
     		{
     		//ok, there is no AP with the given customSelPol field
 	        apRecordToBeModified = static_cast<CCDAccessPointRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdAccessPointRecord));
@@ -2058,8 +2059,6 @@
     		{
     		//there is already an AP with the given customSelPol field
     		//delete the currently used IPProto AP
-    		apRecordToBeModified = CommsDatMapperAndValidator::LoadTheAPL(iLinkAPTagId, iSession.iOwner);
-        	
         	CleanupStack::PushL(apRecordToBeModified);
         	
     		CCDAccessPointRecord* apRecordToBeDeleted = static_cast<CCDAccessPointRecord*>(CCDRecordBase::RecordFactoryL(KCDTIdAccessPointRecord));
@@ -2119,7 +2118,7 @@
     		{
     		//the given IPProto is already existing with the received Link TagId (and cprConfig
     		//field if the connpref is prompting). Let's use that one
-    		apRecordToBeModified = CommsDatMapperAndValidator::LoadTheAPL(iLinkAPTagId, iSession.iOwner);
+    		apRecordToBeModified = CommsDatMapperAndValidator::LoadIPProtoAccessPointL(iLinkAPTagId, iSession.iOwner);
         	
         	CleanupStack::PushL(apRecordToBeModified);