Commit 649ee534 authored by tzik@chromium.org's avatar tzik@chromium.org

[SyncFS] Check MetadataDatabase availability before database operation

This should fix NULL pointer access failure on app reload.

Review URL: https://codereview.chromium.org/166153002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251324 0039d316-1c4b-4281-b951-d872f2087c98
parent e5166792
...@@ -292,7 +292,8 @@ void SyncEngine::DownloadRemoteVersion( ...@@ -292,7 +292,8 @@ void SyncEngine::DownloadRemoteVersion(
} }
void SyncEngine::PromoteDemotedChanges() { void SyncEngine::PromoteDemotedChanges() {
metadata_database_->PromoteLowerPriorityTrackersToNormal(); if (metadata_database_)
metadata_database_->PromoteLowerPriorityTrackersToNormal();
} }
void SyncEngine::ApplyLocalChange( void SyncEngine::ApplyLocalChange(
...@@ -430,12 +431,18 @@ SyncEngine::SyncEngine( ...@@ -430,12 +431,18 @@ SyncEngine::SyncEngine(
void SyncEngine::DoDisableApp(const std::string& app_id, void SyncEngine::DoDisableApp(const std::string& app_id,
const SyncStatusCallback& callback) { const SyncStatusCallback& callback) {
metadata_database_->DisableApp(app_id, callback); if (metadata_database_)
metadata_database_->DisableApp(app_id, callback);
else
callback.Run(SYNC_STATUS_OK);
} }
void SyncEngine::DoEnableApp(const std::string& app_id, void SyncEngine::DoEnableApp(const std::string& app_id,
const SyncStatusCallback& callback) { const SyncStatusCallback& callback) {
metadata_database_->EnableApp(app_id, callback); if (metadata_database_)
metadata_database_->EnableApp(app_id, callback);
else
callback.Run(SYNC_STATUS_OK);
} }
void SyncEngine::PostInitializeTask() { void SyncEngine::PostInitializeTask() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment