equal
deleted
inserted
replaced
1428 // --------------------------------------------------------------------------- |
1428 // --------------------------------------------------------------------------- |
1429 void CCseScheduleDB::CompactDb() |
1429 void CCseScheduleDB::CompactDb() |
1430 { |
1430 { |
1431 CSELOGSTRING_HIGH_LEVEL(">>>CCseScheduleDB::CompactDb"); |
1431 CSELOGSTRING_HIGH_LEVEL(">>>CCseScheduleDB::CompactDb"); |
1432 // Compact database |
1432 // Compact database |
1433 TInt err( iScheduleDb.Compact() ); |
1433 |
1434 if ( err != KErrNone ) |
1434 if( iDbAccess != ECseDbLocked ) |
1435 { |
1435 { |
1436 CSELOGSTRING2_HIGH_LEVEL("iScheduleDb.Compact() failed: %d", err); |
1436 TInt err( iScheduleDb.Compact() ); |
|
1437 if ( err != KErrNone ) |
|
1438 { |
|
1439 CSELOGSTRING2_HIGH_LEVEL("iScheduleDb.Compact() failed: %d", err); |
|
1440 } |
1437 } |
1441 } |
|
1442 |
1438 // Cancel timer if it is running |
1443 // Cancel timer if it is running |
1439 if ( iCompactTimer ) |
1444 if ( iCompactTimer ) |
1440 { |
1445 { |
1441 iCompactTimer->Cancel(); |
1446 iCompactTimer->Cancel(); |
1442 delete iCompactTimer; |
1447 delete iCompactTimer; |
1461 case MBackupObserver::EReleaseLockReadOnly: |
1466 case MBackupObserver::EReleaseLockReadOnly: |
1462 case MBackupObserver::EReleaseLockNoAccess: |
1467 case MBackupObserver::EReleaseLockNoAccess: |
1463 { |
1468 { |
1464 // Backup and restore starting, close the db |
1469 // Backup and restore starting, close the db |
1465 CloseDbFile(); |
1470 CloseDbFile(); |
|
1471 |
|
1472 // Cancel timer if it is running |
|
1473 if ( iCompactTimer ) |
|
1474 { |
|
1475 iCompactTimer->Cancel(); |
|
1476 delete iCompactTimer; |
|
1477 iCompactTimer = NULL; |
|
1478 } |
1466 } |
1479 } |
1467 break; |
1480 break; |
1468 |
1481 |
1469 default: |
1482 default: |
1470 { |
1483 { |