equal
deleted
inserted
replaced
138 delete iMtpDeltaDataMgr; |
138 delete iMtpDeltaDataMgr; |
139 delete iDPIDStore; |
139 delete iDPIDStore; |
140 delete iPkgIDStore; |
140 delete iPkgIDStore; |
141 delete iSentinal; |
141 delete iSentinal; |
142 delete iSnapshotWorker; |
142 delete iSnapshotWorker; |
143 TRAP_IGNORE(CommitTransactionL()); |
143 if (iDbOpened) |
144 iDatabase.Compact(); |
144 { |
|
145 TRAP_IGNORE(CommitTransactionL()); |
|
146 iDatabase.Compact(); |
|
147 } |
145 iBatched.Close(); |
148 iBatched.Close(); |
146 iBatched_SuidHashID.Close(); |
149 iBatched_SuidHashID.Close(); |
147 CloseDb(); |
150 CloseDb(); |
148 iSingletons.Close(); |
151 iSingletons.Close(); |
149 iNonPersistentDPList.Close(); |
152 iNonPersistentDPList.Close(); |
1002 */ |
1005 */ |
1003 void CMTPObjectStore::CreateDbL(const TDesC& aFileName) |
1006 void CMTPObjectStore::CreateDbL(const TDesC& aFileName) |
1004 { |
1007 { |
1005 BaflUtils::EnsurePathExistsL(iSingletons.Fs(), aFileName); |
1008 BaflUtils::EnsurePathExistsL(iSingletons.Fs(), aFileName); |
1006 |
1009 |
1007 LEAVEIFERROR(iDatabase.Replace(iSingletons.Fs(), aFileName, KMTPFormat), |
1010 iDbOpened = EFalse; |
1008 OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_CREATEDBL, " a new non-secure database create error!" )); |
1011 TInt err = iDatabase.Replace(iSingletons.Fs(), aFileName, KMTPFormat); |
1009 |
1012 if ( KErrNone == err ) |
|
1013 { |
|
1014 iDbOpened = ETrue; |
|
1015 } |
|
1016 else |
|
1017 { |
|
1018 OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_CREATEDBL, |
|
1019 " a new non-secure database create error!" ); |
|
1020 User::Leave(err); |
|
1021 } |
|
1022 |
1010 // Create table and index |
1023 // Create table and index |
1011 CreateHandleTableL(); |
1024 CreateHandleTableL(); |
1012 CreateHandleIndexL(); |
1025 CreateHandleIndexL(); |
1013 iUpdateDeltaDataTable = ETrue; |
1026 iUpdateDeltaDataTable = ETrue; |
1014 } |
1027 } |