corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1164100 P1 Cache API should use correct base dir even when reusing sqlite connection. r=ehsan

Browse Source
This commit is contained in:
Ben Kelly
2015-05-13 13:35:34 -07:00
parent 183f7bb354
commit c508363e1c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dom/cache/DBAction.cpp vendored
View File

@@ -54,6 +54,12 @@ DBAction::RunOnTarget(Resolver* aResolver, const QuotaInfo& aQuotaInfo,
return; return;
} }
rv = dbDir->Append(NS_LITERAL_STRING("cache"));
if (NS_WARN_IF(NS_FAILED(rv))) {
aResolver->Resolve(rv);
return;
}
nsCOMPtr<mozIStorageConnection> conn; nsCOMPtr<mozIStorageConnection> conn;
// Attempt to reuse the connection opened by a previous Action. // Attempt to reuse the connection opened by a previous Action.
@@ -63,12 +69,6 @@ DBAction::RunOnTarget(Resolver* aResolver, const QuotaInfo& aQuotaInfo,
// If there is no previous Action, then we must open one. // If there is no previous Action, then we must open one.
if (!conn) { if (!conn) {
rv = dbDir->Append(NS_LITERAL_STRING("cache"));
if (NS_WARN_IF(NS_FAILED(rv))) {
aResolver->Resolve(rv);
return;
}
rv = OpenConnection(aQuotaInfo, dbDir, getter_AddRefs(conn)); rv = OpenConnection(aQuotaInfo, dbDir, getter_AddRefs(conn));
if (NS_WARN_IF(NS_FAILED(rv))) { if (NS_WARN_IF(NS_FAILED(rv))) {
aResolver->Resolve(rv); aResolver->Resolve(rv);