diff -r f23c07ec56e2 -r 85f623e1ef41 metadataengine/server/src/mdsmaintenanceengine.cpp --- a/metadataengine/server/src/mdsmaintenanceengine.cpp Tue Aug 31 15:37:30 2010 +0300 +++ b/metadataengine/server/src/mdsmaintenanceengine.cpp Wed Sep 01 12:24:24 2010 +0100 @@ -120,7 +120,7 @@ TBool isValid(EFalse); TRAPD(err, isValid = iMaintenance->ValidateL( )); - if( err == KErrCorrupt ) + if(err == KErrCorrupt) { DeleteDatabase(); User::Leave( err ); @@ -174,6 +174,11 @@ User::Leave( schemaError ); } } + + if ( FailedImports() != 0 ) + { + User::Leave( KErrBadName ); + } // try to read default import file from C drive TRAPD( err, ImportMetadataL( aManipulate, aSchema, KMdsDefaultImportFile ) ); @@ -183,13 +188,6 @@ // and ignore errors TRAP_IGNORE( ImportMetadataL( aManipulate, aSchema, KMdsDefaultRomImportFile ) ); } - -#ifdef _DEBUG - if ( FailedImports() != 0 ) - { - User::Leave( KErrBadName ); - } -#endif __LOG1( ELogAlways, "MDS DB tables created %d", 0 ); @@ -208,12 +206,6 @@ DeleteDatabase(); User::Leave( err ); } - - if( !iMaintenance->CheckForCorruptionL() ) - { - DeleteDatabase(); - User::Leave( KErrCorrupt ); - } } __LOG1( ELogAlways, "CMdSMaintenanceEngine::InstallL complete: %d", 0 ); }