diff -r 98a7181d2ce7 -r 8b5d60ce1e94 commsfwtools/preparedefaultcommsdatabase/src/CommsDatMapperAndValidatorUtils.h
--- a/commsfwtools/preparedefaultcommsdatabase/src/CommsDatMapperAndValidatorUtils.h	Fri Mar 12 15:49:41 2010 +0200
+++ b/commsfwtools/preparedefaultcommsdatabase/src/CommsDatMapperAndValidatorUtils.h	Mon Mar 15 12:45:15 2010 +0200
@@ -29,6 +29,7 @@
 
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 
+#include <metadatabase.h>
 #include <cdbcols.h>
 #include <in_sock.h> //KAfInet
 //forward declarations
@@ -127,7 +128,8 @@
     
     static TBool IsIPProtoAPAlreadyExistL(TInt aLinkLevelTagId, TInt aConnPrefElementId, CommsDat::CMDBSession& aSession);
     
-    static CommsDat::CCDAccessPointRecord* LoadTheAPL(TInt aLinkLevelTagId, CommsDat::CMDBSession& aSession);
+    static inline CommsDat::CCDAccessPointRecord* LoadIPProtoAccessPointL(TInt aLinkLevelTagId, CommsDat::CMDBSession& aSession);
+    static CommsDat::CCDAccessPointRecord* LoadIPProtoAccessPoint(TInt aLinkLevelTagId, CommsDat::CMDBSession& aSession);
     
     static TInt CountReferenceToThisIPProtoAPL(TUint aElementId, CommsDat::CMDBSession& aSession);
     
@@ -151,11 +153,23 @@
     CommsDatMapperAndValidator& operator=(const CommsDatMapperAndValidator&);
     
     static void CheckTheAPPrioritySelPolFromConnPrefModL(CommsDat::CCDAPPrioritySelectionPolicyRecord*& aAPSelPolRec);
+    static TBool FindIPProtoAccessPointRecordL(CommsDat::CCDAccessPointRecord& aAccessPoints, CommsDat::CMDBSession& aSession);
     
     }; //CommsDatMapperAndValidator
     
+inline CommsDat::CCDAccessPointRecord* CommsDatMapperAndValidator::LoadIPProtoAccessPointL(TInt aLinkLevelTagId, CommsDat::CMDBSession& aSession)
+    {
+    CommsDat::CCDAccessPointRecord* ap = LoadIPProtoAccessPoint(aLinkLevelTagId, aSession);
+    if (!ap)
+        {
+        User::Leave(KErrNotFound);
+        }
+    return ap;
+    }
+
 } //end of namespace CommsDatInternal
 
 #endif //SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 
 #endif //COMMSDATMAPPERANDVALIDATORUTILS_H
+