mozilla-central: changeset 289647:a84154aad44223a19b921da59aa49c1790bd0c9a

author	Andi-Bogdan Postelnicu <bogdan.postelnicu@softvision.ro>
	Mon, 21 Mar 2016 15:17:04 +0200
changeset 289647	a84154aad44223a19b921da59aa49c1790bd0c9a
parent 289646	8dcde91472ccc214bd8cc5acbfa5a387f44aeb5c
child 289648	2458e4f39d35937ba6346051275ce18f93507ca1
push id	30108
push user	cbook@mozilla.com
push date	Tue, 22 Mar 2016 11:14:31 +0000
treeherder	mozilla-central@ea6298e1b4f7 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	janv
bugs	1258339
milestone	48.0a1
first release with	nightly linux32 efe7d026ac64 / 48.0a1 / 20160323030400 / files nightly linux64 efe7d026ac64 / 48.0a1 / 20160323030400 / files nightly mac efe7d026ac64 / 48.0a1 / 20160323030400 / files nightly win32 efe7d026ac64 / 48.0a1 / 20160323030400 / files nightly win64 efe7d026ac64 / 48.0a1 / 20160323030400 / files
last release without	nightly linux32 f14898695ee0 / 48.0a1 / 20160321030217 / files nightly linux64 f14898695ee0 / 48.0a1 / 20160321030217 / files nightly mac f14898695ee0 / 48.0a1 / 20160321030217 / files nightly win32 f14898695ee0 / 48.0a1 / 20160321030217 / files nightly win64 f14898695ee0 / 48.0a1 / 20160321030217 / files

--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -10910,18 +10910,18 @@ UpdateRefcountFunction::Reset()
         return NS_ERROR_FAILURE;
       }
 
       nsresult rv;
       int64_t fileSize;
 
       if (aFileManager->EnforcingQuota()) {
         rv = file->GetFileSize(&fileSize);
-        if (NS_WARN_IF(!file)) {
-          return NS_ERROR_FAILURE;
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
         }
       }
 
       rv = file->Remove(false);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }