content/browser/service_worker/service_worker_database.cc - Issue 846443005: ServiceWorker: ReadRegistration should return NOT_FOUND when the database is not initialized

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/service_worker/service_worker_database.cc

Issue 846443005: ServiceWorker: ReadRegistration should return NOT_FOUND when the database is not initialized (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/service_worker/service_worker_database.h ('k') | content/browser/service_worker/service_worker_database_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_database.cc

diff --git a/content/browser/service_worker/service_worker_database.cc b/content/browser/service_worker/service_worker_database.cc

index cf89aa8b8ca64e08637bab5f7bc4ad74a1f92f48..b6eaeeb7afb9f695c6b49165dc0539769a662d27 100644

--- a/content/browser/service_worker/service_worker_database.cc

+++ b/content/browser/service_worker/service_worker_database.cc

@@ -505,7 +505,9 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadRegistration(

DCHECK(resources);

Status status = LazyOpen(false);

- if (IsNewOrNonexistentDatabase(status) || status != STATUS_OK)

+ if (IsNewOrNonexistentDatabase(status))

+ return STATUS_ERROR_NOT_FOUND;

+ if (status != STATUS_OK)

return status;

RegistrationData value;

@@ -708,7 +710,9 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::ReadUserData(

DCHECK(user_data);

Status status = LazyOpen(false);

- if (IsNewOrNonexistentDatabase(status) || status != STATUS_OK)

+ if (IsNewOrNonexistentDatabase(status))

+ return STATUS_ERROR_NOT_FOUND;

+ if (status != STATUS_OK)

return status;

const std::string key = CreateUserDataKey(registration_id, user_data_name);

@@ -729,7 +733,9 @@ ServiceWorkerDatabase::Status ServiceWorkerDatabase::WriteUserData(

DCHECK(!user_data_name.empty());

Status status = LazyOpen(false);

- if (IsNewOrNonexistentDatabase(status) || status != STATUS_OK)

+ if (IsNewOrNonexistentDatabase(status))

+ return STATUS_ERROR_NOT_FOUND;

+ if (status != STATUS_OK)

return status;

// There should be the registration specified by |registration_id|.